From 6e687b632520bdba0d1bd965a4340f74cdeb8d07 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 1 Jan 2021 17:32:44 +0100 Subject: [PATCH 001/101] yarn2nix: yarn update --- .../tools/yarn2nix-moretea/yarn2nix/yarn.lock | 1380 +++++++++-------- .../tools/yarn2nix-moretea/yarn2nix/yarn.nix | 1298 +++++++++------- 2 files changed, 1497 insertions(+), 1181 deletions(-) diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock index 803f6b3875a..6e22aa4fe4f 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.lock @@ -2,108 +2,113 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8" - integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" + integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g== dependencies: - "@babel/highlight" "^7.0.0" + "@babel/highlight" "^7.8.3" -"@babel/generator@^7.2.2": - version "7.2.2" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.2.2.tgz#18c816c70962640eab42fe8cae5f3947a5c65ccc" - integrity sha512-I4o675J/iS8k+P38dvJ3IBGqObLXyQLTxtrR4u9cSUJOURvafeEWb/pFMOTwtNrmq73mJzyF6ueTbO1BtN0Zeg== +"@babel/generator@^7.9.6": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43" + integrity sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ== dependencies: - "@babel/types" "^7.2.2" + "@babel/types" "^7.9.6" jsesc "^2.5.1" - lodash "^4.17.10" + lodash "^4.17.13" source-map "^0.5.0" - trim-right "^1.0.1" -"@babel/helper-function-name@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53" - integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw== +"@babel/helper-function-name@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c" + integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw== dependencies: - "@babel/helper-get-function-arity" "^7.0.0" - "@babel/template" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/helper-get-function-arity" "^7.8.3" + "@babel/template" "^7.8.3" + "@babel/types" "^7.9.5" -"@babel/helper-get-function-arity@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3" - integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ== +"@babel/helper-get-function-arity@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5" + integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA== dependencies: - "@babel/types" "^7.0.0" + "@babel/types" "^7.8.3" -"@babel/helper-split-export-declaration@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813" - integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag== +"@babel/helper-split-export-declaration@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9" + integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA== dependencies: - "@babel/types" "^7.0.0" + "@babel/types" "^7.8.3" -"@babel/highlight@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4" - integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw== +"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5": + version "7.9.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80" + integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g== + +"@babel/highlight@^7.8.3": + version "7.9.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079" + integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ== dependencies: + "@babel/helper-validator-identifier" "^7.9.0" chalk "^2.0.0" - esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.2.2", "@babel/parser@^7.2.3": - version "7.2.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.2.3.tgz#32f5df65744b70888d17872ec106b02434ba1489" - integrity sha512-0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA== +"@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.6": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7" + integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q== -"@babel/template@^7.1.0": - version "7.2.2" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907" - integrity sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g== +"@babel/runtime-corejs3@^7.8.3": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz#67aded13fffbbc2cb93247388cf84d77a4be9a71" + integrity sha512-6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA== dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.2.2" - "@babel/types" "^7.2.2" + core-js-pure "^3.0.0" + regenerator-runtime "^0.13.4" -"@babel/traverse@^7.0.0": - version "7.2.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8" - integrity sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw== +"@babel/runtime@^7.0.0", "@babel/runtime@^7.4.5": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f" + integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ== dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.2.2" - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-split-export-declaration" "^7.0.0" - "@babel/parser" "^7.2.3" - "@babel/types" "^7.2.2" + regenerator-runtime "^0.13.4" + +"@babel/template@^7.8.3": + version "7.8.6" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b" + integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg== + dependencies: + "@babel/code-frame" "^7.8.3" + "@babel/parser" "^7.8.6" + "@babel/types" "^7.8.6" + +"@babel/traverse@^7.7.0": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442" + integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg== + dependencies: + "@babel/code-frame" "^7.8.3" + "@babel/generator" "^7.9.6" + "@babel/helper-function-name" "^7.9.5" + "@babel/helper-split-export-declaration" "^7.8.3" + "@babel/parser" "^7.9.6" + "@babel/types" "^7.9.6" debug "^4.1.0" globals "^11.1.0" - lodash "^4.17.10" + lodash "^4.17.13" -"@babel/types@^7.0.0", "@babel/types@^7.2.2": - version "7.2.2" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.2.2.tgz#44e10fc24e33af524488b716cdaee5360ea8ed1e" - integrity sha512-fKCuD6UFUMkR541eDWL+2ih/xFZBXPOg/7EQFeTluMDebfqR4jrpaCjLhkWlQS4hT6nRa2PMEgXKbRB5/H2fpg== +"@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.5", "@babel/types@^7.9.6": + version "7.9.6" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz#2c5502b427251e9de1bd2dff95add646d95cc9f7" + integrity sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA== dependencies: - esutils "^2.0.2" - lodash "^4.17.10" + "@babel/helper-validator-identifier" "^7.9.5" + lodash "^4.17.13" to-fast-properties "^2.0.0" -"@iamstarkov/listr-update-renderer@0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@iamstarkov/listr-update-renderer/-/listr-update-renderer-0.4.1.tgz#d7c48092a2dcf90fd672b6c8b458649cb350c77e" - integrity sha512-IJyxQWsYDEkf8C8QthBn5N8tIUR9V9je6j3sMIpAkonaadjbvxmRC6RAhpa3RKxndhNnU2M6iNbtJwd7usQYIA== - dependencies: - chalk "^1.1.3" - cli-truncate "^0.2.1" - elegant-spinner "^1.0.1" - figures "^1.7.0" - indent-string "^3.0.0" - log-symbols "^1.0.2" - log-update "^2.3.0" - strip-ansi "^3.0.1" - "@samverschueren/stream-to-observable@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" @@ -129,9 +134,9 @@ acorn-jsx@^3.0.0: acorn "^3.0.4" acorn-jsx@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e" - integrity sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg== + version "5.2.0" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe" + integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ== acorn@^3.0.4: version "3.3.0" @@ -139,14 +144,14 @@ acorn@^3.0.4: integrity sha1-ReN/s56No/JbruP/U2niu18iAXo= acorn@^5.5.0: - version "5.7.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" - integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== + version "5.7.4" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" + integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg== -acorn@^6.0.2: - version "6.0.5" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.5.tgz#81730c0815f3f3b34d8efa95cb7430965f4d887a" - integrity sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg== +acorn@^6.0.7: + version "6.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474" + integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA== ajv-keywords@^2.1.0: version "2.1.1" @@ -163,20 +168,20 @@ ajv@^5.2.3, ajv@^5.3.0: fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" -ajv@^6.5.3, ajv@^6.6.1: - version "6.6.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d" - integrity sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g== +ajv@^6.10.2, ajv@^6.9.1: + version "6.12.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd" + integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ== dependencies: - fast-deep-equal "^2.0.1" + fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ansi-escapes@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30" - integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw== +ansi-escapes@^3.0.0, ansi-escapes@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" + integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== ansi-regex@^2.0.0: version "2.1.1" @@ -188,10 +193,10 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= -ansi-regex@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9" - integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w== +ansi-regex@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== ansi-styles@^2.2.1: version "2.2.1" @@ -240,13 +245,14 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= -array-includes@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" - integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0= +array-includes@^3.0.3, array-includes@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348" + integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ== dependencies: - define-properties "^1.1.2" - es-abstract "^1.7.0" + define-properties "^1.1.3" + es-abstract "^1.17.0" + is-string "^1.0.5" array-union@^1.0.1: version "1.0.2" @@ -265,6 +271,14 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= +array.prototype.flat@^1.2.1: + version "1.2.3" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b" + integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -285,17 +299,15 @@ astral-regex@^1.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== -atob@^2.1.1: +atob@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -axobject-query@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9" - integrity sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww== - dependencies: - ast-types-flow "0.0.7" +axobject-query@^2.0.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz#2bdffc0371e643e5f03ba99065d5179b9ca79799" + integrity sha512-ICt34ZmrVt8UQnvPl6TVyDTkmhXmAyAT4Jh5ugfGUX4MOrZ+U/ZY6/sdylRw3qGNr9Ub5AJsaHeDMzNLehRdOQ== babel-code-frame@^6.22.0: version "6.26.0" @@ -307,16 +319,16 @@ babel-code-frame@^6.22.0: js-tokens "^3.0.2" babel-eslint@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.1.tgz#919681dc099614cd7d31d45c8908695092a1faed" - integrity sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ== + version "10.1.0" + resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232" + integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg== dependencies: "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.0.0" - "@babel/traverse" "^7.0.0" - "@babel/types" "^7.0.0" - eslint-scope "3.7.1" + "@babel/parser" "^7.7.0" + "@babel/traverse" "^7.7.0" + "@babel/types" "^7.7.0" eslint-visitor-keys "^1.0.0" + resolve "^1.12.0" babel-runtime@^6.23.0, babel-runtime@^6.26.0: version "6.26.0" @@ -378,11 +390,6 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== -builtin-modules@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= - cache-base@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" @@ -430,9 +437,9 @@ callsites@^2.0.0: integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= callsites@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3" - integrity sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw== + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== camelcase-keys@^4.1.0: version "4.2.0" @@ -468,10 +475,10 @@ chalk@^1.0.0, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" - integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ== +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== dependencies: ansi-styles "^3.2.1" escape-string-regexp "^1.0.5" @@ -523,9 +530,9 @@ cli-truncate@^0.2.1: string-width "^1.0.1" cli-width@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" - integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" + integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== cliui@^3.2.0: version "3.2.0" @@ -567,9 +574,9 @@ color-name@1.1.3: integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= commander@^2.11.0, commander@^2.14.1, commander@^2.9.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" - integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== common-tags@^1.4.0: version "1.8.0" @@ -577,9 +584,9 @@ common-tags@^1.4.0: integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw== component-emitter@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" - integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= + version "1.3.0" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" + integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== concat-map@0.0.1: version "0.0.1" @@ -596,6 +603,11 @@ concat-stream@^1.6.0: readable-stream "^2.2.2" typedarray "^0.0.6" +confusing-browser-globals@^1.0.5: + version "1.0.9" + resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz#72bc13b483c0276801681871d4898516f8f54fdd" + integrity sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw== + contains-path@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" @@ -606,33 +618,29 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= +core-js-pure@^3.0.0: + version "3.6.5" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813" + integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA== + core-js@^2.4.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.1.tgz#87416ae817de957a3f249b3b5ca475d4aaed6042" - integrity sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg== + version "2.6.11" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" + integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cosmiconfig@5.0.6: - version "5.0.6" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39" - integrity sha512-6DWfizHriCrFWURP1/qyhsiFvYdlJzbCzmtFWh744+KyWsJo5+kPzUZZaMRSSItoYc0pxFX7gEO7ZC1/gN/7AQ== - dependencies: - is-directory "^0.3.1" - js-yaml "^3.9.0" - parse-json "^4.0.0" - -cosmiconfig@^5.0.7: - version "5.0.7" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04" - integrity sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA== +cosmiconfig@^5.0.7, cosmiconfig@^5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" + integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== dependencies: import-fresh "^2.0.0" is-directory "^0.3.1" - js-yaml "^3.9.0" + js-yaml "^3.13.1" parse-json "^4.0.0" cross-spawn@^5.0.1, cross-spawn@^5.1.0: @@ -656,16 +664,16 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: which "^1.2.9" damerau-levenshtein@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514" - integrity sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ= + version "1.0.6" + resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz#143c1641cb3d85c60c32329e26899adea8701791" + integrity sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug== date-fns@^1.27.2: version "1.30.1" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c" integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw== -debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: +debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -702,9 +710,16 @@ dedent@^0.7.0: integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= deep-equal@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" - integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU= + version "1.1.1" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" + integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== + dependencies: + is-arguments "^1.0.4" + is-date-object "^1.0.1" + is-regex "^1.0.4" + object-is "^1.0.1" + object-keys "^1.1.1" + regexp.prototype.flags "^1.2.0" deep-is@~0.1.3: version "0.1.3" @@ -753,9 +768,9 @@ del@^3.0.0: rimraf "^2.2.8" dlv@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.2.tgz#270f6737b30d25b6657a7e962c784403f85137e5" - integrity sha512-xxD4VSH67GbRvSGUrckvha94RD7hjgOH7rqGxiytLpkaeMvixOHFZTGFK6EkIm3T761OVHT8ABHmGkq9gXgu6Q== + version "1.1.3" + resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" + integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA== docopt@^0.6.2: version "0.6.2" @@ -777,20 +792,27 @@ doctrine@^2.1.0: dependencies: esutils "^2.0.2" +doctrine@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== + dependencies: + esutils "^2.0.2" + elegant-spinner@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= -emoji-regex@^6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.5.1.tgz#9baea929b155565c11ea41c6626eaa65cef992c2" - integrity sha512-PAHp6TxrCy7MGMFidro8uikr+zlJJKJ/Q6mm2ExZ7HwkyR9lSVFfE3kt36qcwa24BQL7y0G9axycGjK1A/0uNQ== +emoji-regex@^7.0.1, emoji-regex@^7.0.2: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== end-of-stream@^1.1.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" - integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q== + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== dependencies: once "^1.4.0" @@ -801,22 +823,27 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.7.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9" - integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg== +es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.5: + version "1.17.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9" + integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg== dependencies: - es-to-primitive "^1.2.0" + es-to-primitive "^1.2.1" function-bind "^1.1.1" has "^1.0.3" - is-callable "^1.1.4" - is-regex "^1.0.4" - object-keys "^1.0.12" + has-symbols "^1.0.1" + is-callable "^1.1.5" + is-regex "^1.0.5" + object-inspect "^1.7.0" + object-keys "^1.1.1" + object.assign "^4.1.0" + string.prototype.trimleft "^2.1.1" + string.prototype.trimright "^2.1.1" -es-to-primitive@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377" - integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg== +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== dependencies: is-callable "^1.1.4" is-date-object "^1.0.1" @@ -827,28 +854,28 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.4, escape-string-regexp@^ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -eslint-config-airbnb-base@^13.1.0: - version "13.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.1.0.tgz#b5a1b480b80dfad16433d6c4ad84e6605052c05c" - integrity sha512-XWwQtf3U3zIoKO1BbHh6aUhJZQweOwSt4c2JrPDg9FP3Ltv3+YfEv7jIDB8275tVnO/qOHbfuYg3kzw6Je7uWw== +eslint-config-airbnb-base@^13.2.0: + version "13.2.0" + resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.2.0.tgz#f6ea81459ff4dec2dda200c35f1d8f7419d57943" + integrity sha512-1mg/7eoB4AUeB0X1c/ho4vb2gYkNH8Trr/EgCT/aGmKhhG+F6vF5s8+iRBlWAzFIAphxIdp3YfEKgEl0f9Xg+w== dependencies: - eslint-restricted-globals "^0.1.1" + confusing-browser-globals "^1.0.5" object.assign "^4.1.0" - object.entries "^1.0.4" + object.entries "^1.1.0" eslint-config-airbnb@^17.1.0: - version "17.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-17.1.0.tgz#3964ed4bc198240315ff52030bf8636f42bc4732" - integrity sha512-R9jw28hFfEQnpPau01NO5K/JWMGLi6aymiF6RsnMURjTk+MqZKllCqGK/0tOvHkPi/NWSSOU2Ced/GX++YxLnw== + version "17.1.1" + resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-17.1.1.tgz#2272e0b86bb1e2b138cdf88d07a3b6f4cda3d626" + integrity sha512-xCu//8a/aWqagKljt+1/qAM62BYZeNq04HmdevG5yUGWpja0I/xhqd6GdLRch5oetEGFiJAnvtGuTEAese53Qg== dependencies: - eslint-config-airbnb-base "^13.1.0" + eslint-config-airbnb-base "^13.2.0" object.assign "^4.1.0" - object.entries "^1.0.4" + object.entries "^1.1.0" eslint-config-prettier@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.3.0.tgz#41afc8d3b852e757f06274ed6c44ca16f939a57d" - integrity sha512-Bc3bh5bAcKNvs3HOpSi6EfGA2IIp7EzWcg2tS4vP7stnXu/J1opihHDM7jI9JCIckyIDTgZLSWn7J3HY0j2JfA== + version "3.6.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.6.0.tgz#8ca3ffac4bd6eeef623a0651f9d754900e3ec217" + integrity sha512-ixJ4U3uTLXwJts4rmSVW/lMXjlGwCijhBJHk8iVqKKSifeI0qgFEfWl8L63isfc8Od7EiBALF6BX3jKLluf/jQ== dependencies: get-stdin "^6.0.0" @@ -857,59 +884,62 @@ eslint-config-standard@^12.0.0: resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz#638b4c65db0bd5a41319f96bba1f15ddad2107d9" integrity sha512-COUz8FnXhqFitYj4DTqHzidjIL/t4mumGZto5c7DrBpvWoie+Sn3P4sLEzUGeYhRElWuFEf8K1S1EfvD1vixCQ== -eslint-import-resolver-node@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a" - integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q== +eslint-import-resolver-node@^0.3.2: + version "0.3.3" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404" + integrity sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg== dependencies: debug "^2.6.9" - resolve "^1.5.0" + resolve "^1.13.1" -eslint-module-utils@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz#b270362cd88b1a48ad308976ce7fa54e98411746" - integrity sha1-snA2LNiLGkitMIl2zn+lTphBF0Y= +eslint-module-utils@^2.4.1: + version "2.6.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6" + integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA== dependencies: - debug "^2.6.8" - pkg-dir "^1.0.0" + debug "^2.6.9" + pkg-dir "^2.0.0" eslint-plugin-es@^1.3.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.0.tgz#475f65bb20c993fc10e8c8fe77d1d60068072da6" - integrity sha512-XfFmgFdIUDgvaRAlaXUkxrRg5JSADoRC8IkKLc/cISeR3yHVMefFHQZpcyXXEUUPHfy5DwviBcrfqlyqEwlQVw== + version "1.4.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.1.tgz#12acae0f4953e76ba444bfd1b2271081ac620998" + integrity sha512-5fa/gR2yR3NxQf+UXkeLeP8FBBl6tSgdrAz1+cF84v1FMM4twGwQoqTnn+QxFLcPOrF4pdKEJKDB/q9GoyJrCA== dependencies: - eslint-utils "^1.3.0" + eslint-utils "^1.4.2" regexpp "^2.0.1" eslint-plugin-import@^2.14.0: - version "2.14.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz#6b17626d2e3e6ad52cfce8807a845d15e22111a8" - integrity sha512-FpuRtniD/AY6sXByma2Wr0TXvXJ4nA/2/04VPlfpmUDPOpOY264x+ILiwnrk/k4RINgDAyFZByxqPUbSQ5YE7g== + version "2.20.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz#91fc3807ce08be4837141272c8b99073906e588d" + integrity sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg== dependencies: + array-includes "^3.0.3" + array.prototype.flat "^1.2.1" contains-path "^0.1.0" - debug "^2.6.8" + debug "^2.6.9" doctrine "1.5.0" - eslint-import-resolver-node "^0.3.1" - eslint-module-utils "^2.2.0" - has "^1.0.1" - lodash "^4.17.4" - minimatch "^3.0.3" + eslint-import-resolver-node "^0.3.2" + eslint-module-utils "^2.4.1" + has "^1.0.3" + minimatch "^3.0.4" + object.values "^1.1.0" read-pkg-up "^2.0.0" - resolve "^1.6.0" + resolve "^1.12.0" eslint-plugin-jsx-a11y@^6.1.2: - version "6.1.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.1.2.tgz#69bca4890b36dcf0fe16dd2129d2d88b98f33f88" - integrity sha512-7gSSmwb3A+fQwtw0arguwMdOdzmKUgnUcbSNlo+GjKLAQFuC2EZxWqG9XHRI8VscBJD5a8raz3RuxQNFW+XJbw== + version "6.2.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz#b872a09d5de51af70a97db1eea7dc933043708aa" + integrity sha512-CawzfGt9w83tyuVekn0GDPU9ytYtxyxyFZ3aSWROmnRRFQFT2BiPJd7jvRdzNDi6oLWaS2asMeYSNMjWTV4eNg== dependencies: + "@babel/runtime" "^7.4.5" aria-query "^3.0.0" array-includes "^3.0.3" ast-types-flow "^0.0.7" - axobject-query "^2.0.1" + axobject-query "^2.0.2" damerau-levenshtein "^1.0.4" - emoji-regex "^6.5.1" + emoji-regex "^7.0.2" has "^1.0.3" - jsx-ast-utils "^2.0.1" + jsx-ast-utils "^2.2.1" eslint-plugin-node@^8.0.0: version "8.0.1" @@ -924,40 +954,31 @@ eslint-plugin-node@^8.0.0: semver "^5.5.0" eslint-plugin-promise@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.0.1.tgz#2d074b653f35a23d1ba89d8e976a985117d1c6a2" - integrity sha512-Si16O0+Hqz1gDHsys6RtFRrW7cCTB6P7p3OJmKp3Y3dxpQE2qwOA7d3xnV+0mBmrPoi0RBnxlCKvqu70te6wjg== + version "4.2.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a" + integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw== eslint-plugin-react@^7.12.2: - version "7.12.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.12.3.tgz#b9ca4cd7cd3f5d927db418a1950366a12d4568fd" - integrity sha512-WTIA3cS8OzkPeCi4KWuPmjR33lgG9r9Y/7RmnLTRw08MZKgAfnK/n3BO4X0S67MPkVLazdfCNT/XWqcDu4BLTA== + version "7.20.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz#f98712f0a5e57dfd3e5542ef0604b8739cd47be3" + integrity sha512-rqe1abd0vxMjmbPngo4NaYxTcR3Y4Hrmc/jg4T+sYz63yqlmJRknpEQfmWY+eDWPuMmix6iUIK+mv0zExjeLgA== dependencies: - array-includes "^3.0.3" + array-includes "^3.1.1" doctrine "^2.1.0" has "^1.0.3" - jsx-ast-utils "^2.0.1" - object.fromentries "^2.0.0" - prop-types "^15.6.2" - resolve "^1.9.0" + jsx-ast-utils "^2.2.3" + object.entries "^1.1.1" + object.fromentries "^2.0.2" + object.values "^1.1.1" + prop-types "^15.7.2" + resolve "^1.15.1" + string.prototype.matchall "^4.0.2" + xregexp "^4.3.0" eslint-plugin-standard@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.0.tgz#f845b45109c99cd90e77796940a344546c8f6b5c" - integrity sha512-OwxJkR6TQiYMmt1EsNRMe5qG3GsbjlcOhbGUBY4LtavF9DsLaTcoR+j2Tdjqi23oUwKNUqX7qcn5fPStafMdlA== - -eslint-restricted-globals@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz#35f0d5cbc64c2e3ed62e93b4b1a7af05ba7ed4d7" - integrity sha1-NfDVy8ZMLj7WLpO0saevBbp+1Nc= - -eslint-scope@3.7.1: - version "3.7.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" - integrity sha1-PWPD7f2gLgbgGkUq2IyqzHzctug= - dependencies: - esrecurse "^4.1.0" - estraverse "^4.1.1" + version "4.0.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz#ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4" + integrity sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ== eslint-scope@^3.7.1: version "3.7.3" @@ -967,23 +988,25 @@ eslint-scope@^3.7.1: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-scope@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172" - integrity sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA== +eslint-scope@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" + integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg== dependencies: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.3.0, eslint-utils@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512" - integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q== +eslint-utils@^1.3.1, eslint-utils@^1.4.2: + version "1.4.3" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" + integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== + dependencies: + eslint-visitor-keys "^1.1.0" -eslint-visitor-keys@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" - integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ== +eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" + integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== eslint@^4.0.0, eslint@^4.5.0: version "4.19.1" @@ -1030,46 +1053,45 @@ eslint@^4.0.0, eslint@^4.5.0: text-table "~0.2.0" eslint@^5.11.1: - version "5.12.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.12.0.tgz#fab3b908f60c52671fb14e996a450b96c743c859" - integrity sha512-LntwyPxtOHrsJdcSwyQKVtHofPHdv+4+mFwEe91r2V13vqpM8yLr7b1sW+Oo/yheOPkWYsYlYJCkzlFAt8KV7g== + version "5.16.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea" + integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg== dependencies: "@babel/code-frame" "^7.0.0" - ajv "^6.5.3" + ajv "^6.9.1" chalk "^2.1.0" cross-spawn "^6.0.5" debug "^4.0.1" - doctrine "^2.1.0" - eslint-scope "^4.0.0" + doctrine "^3.0.0" + eslint-scope "^4.0.3" eslint-utils "^1.3.1" eslint-visitor-keys "^1.0.0" - espree "^5.0.0" + espree "^5.0.1" esquery "^1.0.1" esutils "^2.0.2" - file-entry-cache "^2.0.0" + file-entry-cache "^5.0.1" functional-red-black-tree "^1.0.1" glob "^7.1.2" globals "^11.7.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" - inquirer "^6.1.0" - js-yaml "^3.12.0" + inquirer "^6.2.2" + js-yaml "^3.13.0" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.3.0" - lodash "^4.17.5" + lodash "^4.17.11" minimatch "^3.0.4" mkdirp "^0.5.1" natural-compare "^1.4.0" optionator "^0.8.2" path-is-inside "^1.0.2" - pluralize "^7.0.0" progress "^2.0.0" regexpp "^2.0.1" semver "^5.5.1" strip-ansi "^4.0.0" strip-json-comments "^2.0.1" - table "^5.0.2" + table "^5.2.3" text-table "^0.2.0" espree@^3.5.2, espree@^3.5.4: @@ -1080,12 +1102,12 @@ espree@^3.5.2, espree@^3.5.4: acorn "^5.5.0" acorn-jsx "^3.0.0" -espree@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.0.tgz#fc7f984b62b36a0f543b13fb9cd7b9f4a7f5b65c" - integrity sha512-1MpUfwsdS9MMoN7ZXqAr9e9UKdVHDcvrJpyx7mm1WuQlx/ygErEQBzgi5Nh5qBHIoYweprhtMkTCb9GhcAIcsA== +espree@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a" + integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A== dependencies: - acorn "^6.0.2" + acorn "^6.0.7" acorn-jsx "^5.0.0" eslint-visitor-keys "^1.0.0" @@ -1095,11 +1117,11 @@ esprima@^4.0.0: integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== esquery@^1.0.0, esquery@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708" - integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA== + version "1.3.1" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" + integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== dependencies: - estraverse "^4.0.0" + estraverse "^5.1.0" esrecurse@^4.1.0: version "4.2.1" @@ -1108,15 +1130,20 @@ esrecurse@^4.1.0: dependencies: estraverse "^4.1.0" -estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" - integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM= +estraverse@^4.1.0, estraverse@^4.1.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642" + integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw== esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" - integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs= + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== execa@^0.7.0: version "0.7.0" @@ -1181,10 +1208,10 @@ external-editor@^2.0.4: iconv-lite "^0.4.17" tmp "^0.0.33" -external-editor@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27" - integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA== +external-editor@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" + integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== dependencies: chardet "^0.7.0" iconv-lite "^0.4.24" @@ -1209,17 +1236,17 @@ fast-deep-equal@^1.0.0: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ= -fast-deep-equal@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" - integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk= +fast-deep-equal@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" + integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA== fast-json-stable-stringify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-levenshtein@~2.0.4: +fast-levenshtein@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= @@ -1247,6 +1274,13 @@ file-entry-cache@^2.0.0: flat-cache "^1.2.1" object-assign "^4.0.1" +file-entry-cache@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" + integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g== + dependencies: + flat-cache "^2.0.1" + fill-range@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" @@ -1257,19 +1291,6 @@ fill-range@^4.0.0: repeat-string "^1.6.1" to-regex-range "^2.1.0" -find-parent-dir@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54" - integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ= - -find-up@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" - integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8= - dependencies: - path-exists "^2.0.0" - pinkie-promise "^2.0.0" - find-up@^2.0.0, find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -1294,6 +1315,25 @@ flat-cache@^1.2.1: rimraf "~2.6.2" write "^0.2.1" +flat-cache@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" + integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA== + dependencies: + flatted "^2.0.0" + rimraf "2.6.3" + write "1.0.3" + +flatted@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" + integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== + +fn-name@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7" + integrity sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc= + for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -1336,9 +1376,9 @@ get-caller-file@^1.0.1: integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== get-own-enumerable-property-symbols@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz#b877b49a5c16aefac3655f2ed2ea5b684df8d203" - integrity sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg== + version "3.0.2" + resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" + integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== get-stdin@^5.0.1: version "5.0.1" @@ -1368,9 +1408,9 @@ get-value@^2.0.3, get-value@^2.0.6: integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3: - version "7.1.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1" - integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ== + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -1392,9 +1432,9 @@ glob@~7.0.6: path-is-absolute "^1.0.0" globals@^11.0.1, globals@^11.1.0, globals@^11.7.0: - version "11.9.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249" - integrity sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg== + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globby@^6.1.0: version "6.1.0" @@ -1408,9 +1448,9 @@ globby@^6.1.0: pinkie-promise "^2.0.0" graceful-fs@^4.1.2: - version "4.1.15" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" - integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== + version "4.2.4" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" + integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== has-ansi@^2.0.0: version "2.0.0" @@ -1429,10 +1469,10 @@ has-flag@^3.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= -has-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" - integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q= +has-symbols@^1.0.0, has-symbols@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" + integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== has-value@^0.3.1: version "0.3.1" @@ -1465,7 +1505,7 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has@^1.0.1, has@^1.0.3: +has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== @@ -1473,9 +1513,9 @@ has@^1.0.1, has@^1.0.3: function-bind "^1.1.1" hosted-git-info@^2.1.4: - version "2.7.1" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047" - integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w== + version "2.8.8" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" + integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== husky@^1.3.1: version "1.3.1" @@ -1511,9 +1551,9 @@ ignore@^4.0.6: integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== ignore@^5.0.2: - version "5.0.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.0.4.tgz#33168af4a21e99b00c5d41cbadb6a6cb49903a45" - integrity sha512-WLsTMEhsQuXpCiG173+f3aymI43SXa+fB1rSfbzyP4GkPP+ZFVuO0/3sFUGNBtifisPeDcl/uD/Y2NxZ7xFq4g== + version "5.1.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" + integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== import-fresh@^2.0.0: version "2.0.0" @@ -1524,9 +1564,9 @@ import-fresh@^2.0.0: resolve-from "^3.0.0" import-fresh@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.0.0.tgz#a3d897f420cab0e671236897f75bc14b4885c390" - integrity sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ== + version "3.2.1" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" + integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== dependencies: parent-module "^1.0.0" resolve-from "^4.0.0" @@ -1550,9 +1590,9 @@ inflight@^1.0.4: wrappy "1" inherits@2, inherits@^2.0.3, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== inquirer@^3.0.6: version "3.3.0" @@ -1574,25 +1614,34 @@ inquirer@^3.0.6: strip-ansi "^4.0.0" through "^2.3.6" -inquirer@^6.1.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52" - integrity sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg== +inquirer@^6.2.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca" + integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ== dependencies: - ansi-escapes "^3.0.0" - chalk "^2.0.0" + ansi-escapes "^3.2.0" + chalk "^2.4.2" cli-cursor "^2.1.0" cli-width "^2.0.0" - external-editor "^3.0.0" + external-editor "^3.0.3" figures "^2.0.0" - lodash "^4.17.10" + lodash "^4.17.12" mute-stream "0.0.7" run-async "^2.2.0" - rxjs "^6.1.0" + rxjs "^6.4.0" string-width "^2.1.0" - strip-ansi "^5.0.0" + strip-ansi "^5.1.0" through "^2.3.6" +internal-slot@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3" + integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g== + dependencies: + es-abstract "^1.17.0-next.1" + has "^1.0.3" + side-channel "^1.0.2" + invert-kv@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" @@ -1612,6 +1661,11 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" +is-arguments@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3" + integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA== + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -1622,17 +1676,10 @@ is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-builtin-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" - integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74= - dependencies: - builtin-modules "^1.0.0" - -is-callable@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" - integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== +is-callable@^1.1.4, is-callable@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab" + integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q== is-ci@^2.0.0: version "2.0.0" @@ -1656,9 +1703,9 @@ is-data-descriptor@^1.0.0: kind-of "^6.0.0" is-date-object@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" - integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" + integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== is-descriptor@^0.1.0: version "0.1.6" @@ -1713,9 +1760,9 @@ is-fullwidth-code-point@^2.0.0: integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= is-glob@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0" - integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A= + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== dependencies: is-extglob "^2.1.1" @@ -1757,7 +1804,7 @@ is-path-inside@^1.0.0: dependencies: path-is-inside "^1.0.1" -is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: +is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== @@ -1765,16 +1812,16 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: isobject "^3.0.1" is-promise@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" - integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= + version "2.2.2" + resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" + integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== -is-regex@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" - integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= +is-regex@^1.0.4, is-regex@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" + integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ== dependencies: - has "^1.0.1" + has "^1.0.3" is-regexp@^1.0.0: version "1.0.0" @@ -1791,12 +1838,17 @@ is-stream@^1.1.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= +is-string@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" + integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== + is-symbol@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38" - integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw== + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" + integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== dependencies: - has-symbols "^1.0.0" + has-symbols "^1.0.1" is-windows@^1.0.2: version "1.0.2" @@ -1825,21 +1877,6 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -jest-get-type@^22.1.0: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4" - integrity sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w== - -jest-validate@^23.5.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.6.0.tgz#36761f99d1ed33fcd425b4e4c5595d62b6597474" - integrity sha512-OFKapYxe72yz7agrDAWi8v2WL8GIfVqcbKRCLbRG9PAxtzF9b1SEDdTpytNDN12z2fJynoBwpMpvj2R39plI2A== - dependencies: - chalk "^2.0.1" - jest-get-type "^22.1.0" - leven "^2.1.0" - pretty-format "^23.6.0" - "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -1850,10 +1887,10 @@ js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@^3.12.0, js-yaml@^3.9.0, js-yaml@^3.9.1: - version "3.12.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600" - integrity sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA== +js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.9.1: + version "3.13.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" + integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== dependencies: argparse "^1.0.7" esprima "^4.0.0" @@ -1883,12 +1920,13 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= -jsx-ast-utils@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f" - integrity sha1-6AGxs5mF4g//yHtA43SAgOLcrH8= +jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f" + integrity sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA== dependencies: array-includes "^3.0.3" + object.assign "^4.1.0" kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" @@ -1910,9 +1948,9 @@ kind-of@^5.0.0: integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== kind-of@^6.0.0, kind-of@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" - integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== lcid@^1.0.0: version "1.0.0" @@ -1921,11 +1959,6 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" -leven@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580" - integrity sha1-wuep93IJTe6dNCAq6KzORoeHVYA= - levn@^0.3.0, levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" @@ -1935,25 +1968,23 @@ levn@^0.3.0, levn@~0.3.0: type-check "~0.3.2" lint-staged@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.1.0.tgz#dbc3ae2565366d8f20efb9f9799d076da64863f2" - integrity sha512-yfSkyJy7EuVsaoxtUSEhrD81spdJOe/gMTGea3XaV7HyoRhTb9Gdlp6/JppRZERvKSEYXP9bjcmq6CA5oL2lYQ== + version "8.2.1" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.2.1.tgz#752fcf222d9d28f323a3b80f1e668f3654ff221f" + integrity sha512-n0tDGR/rTCgQNwXnUf/eWIpPNddGWxC32ANTNYsj2k02iZb7Cz5ox2tytwBu+2r0zDXMEMKw7Y9OD/qsav561A== dependencies: - "@iamstarkov/listr-update-renderer" "0.4.1" chalk "^2.3.1" commander "^2.14.1" - cosmiconfig "5.0.6" + cosmiconfig "^5.2.0" debug "^3.1.0" dedent "^0.7.0" del "^3.0.0" execa "^1.0.0" - find-parent-dir "^0.3.0" g-status "^2.0.2" is-glob "^4.0.0" is-windows "^1.0.2" - jest-validate "^23.5.0" listr "^0.14.2" - lodash "^4.17.5" + listr-update-renderer "^0.5.0" + lodash "^4.17.11" log-symbols "^2.2.0" micromatch "^3.1.8" npm-which "^3.0.1" @@ -1964,6 +1995,7 @@ lint-staged@^8.1.0: staged-git-files "1.1.2" string-argv "^0.0.2" stringify-object "^3.2.2" + yup "^0.27.0" listr-silent-renderer@^1.1.1: version "1.1.1" @@ -2041,19 +2073,19 @@ lodash.memoize@^4.1.2: integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= lodash.merge@^4.6.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54" - integrity sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ== + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== lodash.unescape@4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c" integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw= -lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0: - version "4.17.11" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" - integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== +lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.4, lodash@^4.3.0: + version "4.17.15" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== log-symbols@^1.0.2: version "1.0.2" @@ -2087,11 +2119,11 @@ loglevel-colored-level-prefix@^1.0.0: loglevel "^1.4.1" loglevel@^1.4.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa" - integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po= + version "1.6.8" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171" + integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA== -loose-envify@^1.3.1: +loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== @@ -2184,37 +2216,32 @@ mimic-fn@^1.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== -minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: +minimatch@^3.0.2, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== dependencies: brace-expansion "^1.1.7" -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= - -minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= +minimist@^1.2.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== mixin-deep@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe" - integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ== + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== dependencies: for-in "^1.0.2" is-extendable "^1.0.1" mkdirp@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== dependencies: - minimist "0.0.8" + minimist "^1.2.5" ms@2.0.0: version "2.0.0" @@ -2222,9 +2249,9 @@ ms@2.0.0: integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= ms@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== mute-stream@0.0.7: version "0.0.7" @@ -2266,12 +2293,12 @@ nopt@~3.0.6: abbrev "1" normalize-package-data@^2.3.2: - version "2.4.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" - integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw== + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== dependencies: hosted-git-info "^2.1.4" - is-builtin-module "^1.0.0" + resolve "^1.10.0" semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" @@ -2317,10 +2344,23 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-keys@^1.0.11, object-keys@^1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2" - integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag== +object-inspect@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" + integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== + +object-is@^1.0.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz#c5d2e87ff9e119f78b7a088441519e2eec1573b6" + integrity sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + +object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== object-visit@^1.0.0: version "1.0.1" @@ -2339,25 +2379,25 @@ object.assign@^4.1.0: has-symbols "^1.0.0" object-keys "^1.0.11" -object.entries@^1.0.4: - version "1.1.0" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519" - integrity sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA== +object.entries@^1.1.0, object.entries@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz#ee1cf04153de02bb093fec33683900f57ce5399b" + integrity sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ== dependencies: define-properties "^1.1.3" - es-abstract "^1.12.0" + es-abstract "^1.17.0-next.1" function-bind "^1.1.1" has "^1.0.3" -object.fromentries@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.0.tgz#49a543d92151f8277b3ac9600f1e930b189d30ab" - integrity sha512-9iLiI6H083uiqUuvzyY6qrlmc/Gz8hLQFOcb/Ri/0xXFkSNS3ctV+CbE6yM2+AnkYfOB3dGjdzC0wrMLIhQICA== +object.fromentries@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9" + integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ== dependencies: - define-properties "^1.1.2" - es-abstract "^1.11.0" + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" function-bind "^1.1.1" - has "^1.0.1" + has "^1.0.3" object.pick@^1.3.0: version "1.3.0" @@ -2366,6 +2406,16 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" +object.values@^1.1.0, object.values@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" + integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + function-bind "^1.1.1" + has "^1.0.3" + once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -2381,16 +2431,16 @@ onetime@^2.0.0: mimic-fn "^1.0.0" optionator@^0.8.2: - version "0.8.2" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64" - integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q= + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== dependencies: deep-is "~0.1.3" - fast-levenshtein "~2.0.4" + fast-levenshtein "~2.0.6" levn "~0.3.0" prelude-ls "~1.1.2" type-check "~0.3.2" - wordwrap "~1.0.0" + word-wrap "~1.2.3" os-locale@^2.0.0: version "2.1.0" @@ -2419,9 +2469,9 @@ p-limit@^1.1.0: p-try "^1.0.0" p-limit@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.1.0.tgz#1d5a0d20fb12707c758a655f6bbc4386b5930d68" - integrity sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g== + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== dependencies: p-try "^2.0.0" @@ -2445,9 +2495,9 @@ p-map@^1.1.1: integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA== p-map@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.0.0.tgz#be18c5a5adeb8e156460651421aceca56c213a50" - integrity sha512-GO107XdrSUmtHxVoi60qc9tUl/KkNKm+X2CF4P9amalpGxv5YqVPJNfSb0wcA+syCopkZvYYIzW8OVTQW59x/w== + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" + integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== p-try@^1.0.0: version "1.0.0" @@ -2455,14 +2505,14 @@ p-try@^1.0.0: integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= p-try@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1" - integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ== + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== parent-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.0.tgz#df250bdc5391f4a085fb589dad761f5ad6b865b5" - integrity sha512-8Mf5juOMmiE4FcmzYc4IaiS9L3+9paz2KOiXzkRviCP6aDmN49Hz6EMWz0lGNp9pX80GvvAuLADtyGfW/Em3TA== + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== dependencies: callsites "^3.0.0" @@ -2486,13 +2536,6 @@ pascalcase@^0.1.1: resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= -path-exists@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" - integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= - dependencies: - pinkie-promise "^2.0.0" - path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" @@ -2547,12 +2590,12 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= -pkg-dir@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4" - integrity sha1-ektQio1bstYp1EcFb/TpyTFM89Q= +pkg-dir@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" + integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= dependencies: - find-up "^1.0.0" + find-up "^2.1.0" pkg-dir@^3.0.0: version "3.0.0" @@ -2562,9 +2605,9 @@ pkg-dir@^3.0.0: find-up "^3.0.0" please-upgrade-node@^3.0.2, please-upgrade-node@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac" - integrity sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ== + version "3.2.0" + resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" + integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== dependencies: semver-compare "^1.0.0" @@ -2627,11 +2670,11 @@ prettier-eslint@^8.5.0: vue-eslint-parser "^2.0.2" prettier@^1.7.0: - version "1.15.3" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.3.tgz#1feaac5bdd181237b54dbe65d874e02a1472786a" - integrity sha512-gAU9AGAPMaKb3NNSUUuhhFAS7SCO4ALTN4nRIn6PJ075Qd28Yn2Ig2ahEJWdJwJmlEBTUfC7mMUSFy8MwsOCfg== + version "1.19.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" + integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== -pretty-format@^23.0.1, pretty-format@^23.6.0: +pretty-format@^23.0.1: version "23.6.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760" integrity sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw== @@ -2640,22 +2683,28 @@ pretty-format@^23.0.1, pretty-format@^23.6.0: ansi-styles "^3.2.0" process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" - integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== progress@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -prop-types@^15.6.2: - version "15.6.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102" - integrity sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ== +prop-types@^15.7.2: + version "15.7.2" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" + integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== dependencies: - loose-envify "^1.3.1" + loose-envify "^1.4.0" object-assign "^4.1.1" + react-is "^16.8.1" + +property-expr@^1.5.0: + version "1.5.1" + resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-1.5.1.tgz#22e8706894a0c8e28d58735804f6ba3a3673314f" + integrity sha512-CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g== pseudomap@^1.0.2: version "1.0.2" @@ -2685,6 +2734,11 @@ ramda@^0.26.1: resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06" integrity sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ== +react-is@^16.8.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== + read-pkg-up@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" @@ -2712,9 +2766,9 @@ read-pkg@^4.0.1: pify "^3.0.0" readable-stream@^2.2.2: - version "2.3.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" - integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== dependencies: core-util-is "~1.0.0" inherits "~2.0.3" @@ -2729,6 +2783,11 @@ regenerator-runtime@^0.11.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== +regenerator-runtime@^0.13.4: + version "0.13.5" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" + integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== + regex-not@^1.0.0, regex-not@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" @@ -2737,6 +2796,14 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" +regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" + integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + regexpp@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab" @@ -2805,10 +2872,10 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1, resolve@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06" - integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ== +resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.8.1: + version "1.17.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" + integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== dependencies: path-parse "^1.0.6" @@ -2825,19 +2892,24 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== -rimraf@^2.2.8, rimraf@~2.6.2: +rimraf@2.6.3, rimraf@~2.6.2: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== dependencies: glob "^7.1.3" -run-async@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" - integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA= +rimraf@^2.2.8: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== dependencies: - is-promise "^2.1.0" + glob "^7.1.3" + +run-async@^2.2.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" + integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== run-node@^1.0.0: version "1.0.0" @@ -2863,10 +2935,10 @@ rxjs@^5.3.0: dependencies: symbol-observable "1.0.1" -rxjs@^6.1.0, rxjs@^6.3.3: - version "6.3.3" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55" - integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw== +rxjs@^6.3.3, rxjs@^6.4.0: + version "6.5.5" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec" + integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ== dependencies: tslib "^1.9.0" @@ -2893,9 +2965,9 @@ semver-compare@^1.0.0: integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.5.1: - version "5.6.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" - integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== semver@5.5.0: version "5.5.0" @@ -2907,20 +2979,10 @@ set-blocking@^2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= -set-value@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" - integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE= - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.1" - to-object-path "^0.3.0" - -set-value@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" - integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg== +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== dependencies: extend-shallow "^2.0.1" is-extendable "^0.1.1" @@ -2939,15 +3001,23 @@ shebang-regex@^1.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= +side-channel@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947" + integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA== + dependencies: + es-abstract "^1.17.0-next.1" + object-inspect "^1.7.0" + signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== simple-git@^1.85.0: - version "1.107.0" - resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.107.0.tgz#12cffaf261c14d6f450f7fdb86c21ccee968b383" - integrity sha512-t4OK1JRlp4ayKRfcW6owrWcRVLyHRUlhGd0uN6ZZTqfDq8a5XpcUdOKiGRNobHEuMtNqzp0vcJNvhYWwh5PsQA== + version "1.132.0" + resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.132.0.tgz#53ac4c5ec9e74e37c2fd461e23309f22fcdf09b1" + integrity sha512-xauHm1YqCTom1sC9eOjfq3/9RKiUA9iPnxBbrY2DdL8l4ADMu0jjM5l5lphQP5YWNqAL2aXC/OeuQ76vHtW5fg== dependencies: debug "^4.0.1" @@ -2968,10 +3038,10 @@ slice-ansi@1.0.0: dependencies: is-fullwidth-code-point "^2.0.0" -slice-ansi@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.0.0.tgz#5373bdb8559b45676e8541c66916cdd6251612e7" - integrity sha512-4j2WTWjp3GsZ+AOagyzVbzp4vWGtZ0hEZ/gDY/uTvm6MTxUfTUIsnMIFb1bn8o0RuXiqUw15H1bue8f22Vw2oQ== +slice-ansi@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" + integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== dependencies: ansi-styles "^3.2.0" astral-regex "^1.0.0" @@ -3008,11 +3078,11 @@ snapdragon@^0.8.1: use "^3.1.0" source-map-resolve@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" - integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA== + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== dependencies: - atob "^2.1.1" + atob "^2.1.2" decode-uri-component "^0.2.0" resolve-url "^0.2.1" source-map-url "^0.4.0" @@ -3037,22 +3107,22 @@ spdx-correct@^3.0.0: spdx-license-ids "^3.0.0" spdx-exceptions@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977" - integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA== + version "2.3.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" + integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== spdx-expression-parse@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" - integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg== + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== dependencies: spdx-exceptions "^2.1.0" spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz#81c0ce8f21474756148bbb5f3bfc0f36bf15d76e" - integrity sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g== + version "3.0.5" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654" + integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q== split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" @@ -3101,6 +3171,61 @@ string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +string-width@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + +string.prototype.matchall@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e" + integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0" + has-symbols "^1.0.1" + internal-slot "^1.0.2" + regexp.prototype.flags "^1.3.0" + side-channel "^1.0.2" + +string.prototype.trimend@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913" + integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + +string.prototype.trimleft@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc" + integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + string.prototype.trimstart "^1.0.0" + +string.prototype.trimright@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3" + integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + string.prototype.trimend "^1.0.0" + +string.prototype.trimstart@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54" + integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -3131,12 +3256,12 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f" - integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow== +strip-ansi@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== dependencies: - ansi-regex "^4.0.0" + ansi-regex "^4.1.0" strip-bom@^3.0.0: version "3.0.0" @@ -3182,6 +3307,11 @@ symbol-observable@^1.1.0: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== +synchronous-promise@^2.0.6: + version "2.0.12" + resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.12.tgz#219934f23c19c9aa716276cf2e1f8d4e5b04d07f" + integrity sha512-rIDJiHmIK02tXU+eW1v6a7rNIIiMLm5JUF5Uj2fT6oLSulg7WNDVoqvkYqkFoJzf4v2gmTLppvzegdo9R+7h1Q== + table@4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36" @@ -3194,15 +3324,15 @@ table@4.0.2: slice-ansi "1.0.0" string-width "^2.1.1" -table@^5.0.2: - version "5.1.1" - resolved "https://registry.yarnpkg.com/table/-/table-5.1.1.tgz#92030192f1b7b51b6eeab23ed416862e47b70837" - integrity sha512-NUjapYb/qd4PeFW03HnAuOJ7OMcBkJlqeClWxeNlQ0lXGSb52oZXGzkO0/I0ARegQ2eUT1g2VDJH0eUxDRcHmw== +table@^5.2.3: + version "5.4.6" + resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" + integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug== dependencies: - ajv "^6.6.1" - lodash "^4.17.11" - slice-ansi "2.0.0" - string-width "^2.1.1" + ajv "^6.10.2" + lodash "^4.17.14" + slice-ansi "^2.1.0" + string-width "^3.0.0" text-table@^0.2.0, text-table@~0.2.0: version "0.2.0" @@ -3251,15 +3381,15 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= +toposort@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330" + integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA= tslib@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" - integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ== + version "1.13.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" + integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== type-check@~0.3.2: version "0.3.2" @@ -3287,14 +3417,14 @@ typescript@^2.5.1: integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w== union-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" - integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ= + version "1.0.1" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" + integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== dependencies: arr-union "^3.1.0" get-value "^2.0.6" is-extendable "^0.1.1" - set-value "^0.4.3" + set-value "^2.0.1" unset-value@^1.0.0: version "1.0.0" @@ -3358,10 +3488,10 @@ which@^1.2.10, which@^1.2.9: dependencies: isexe "^2.0.0" -wordwrap@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= +word-wrap@~1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== wrap-ansi@^2.0.0: version "2.1.0" @@ -3384,6 +3514,13 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= +write@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" + integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig== + dependencies: + mkdirp "^0.5.1" + write@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757" @@ -3391,6 +3528,13 @@ write@^0.2.1: dependencies: mkdirp "^0.5.1" +xregexp@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50" + integrity sha512-7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g== + dependencies: + "@babel/runtime-corejs3" "^7.8.3" + y18n@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" @@ -3425,3 +3569,15 @@ yargs@10.0.3: which-module "^2.0.0" y18n "^3.2.1" yargs-parser "^8.0.0" + +yup@^0.27.0: + version "0.27.0" + resolved "https://registry.yarnpkg.com/yup/-/yup-0.27.0.tgz#f8cb198c8e7dd2124beddc2457571329096b06e7" + integrity sha512-v1yFnE4+u9za42gG/b/081E7uNW9mUj3qtkmelLbW5YPROZzSH/KUUyJu9Wt8vxFJcT9otL/eZopS0YK1L5yPQ== + dependencies: + "@babel/runtime" "^7.0.0" + fn-name "~2.0.1" + lodash "^4.17.11" + property-expr "^1.5.0" + synchronous-promise "^2.0.6" + toposort "^2.0.2" diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix index 9f4154b328b..b8dba6833fb 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/yarn.nix @@ -1,92 +1,108 @@ -{ fetchurl, linkFarm, runCommandNoCC, gnutar }: rec { +{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { offline_cache = linkFarm "offline" packages; packages = [ { - name = "_babel_code_frame___code_frame_7.0.0.tgz"; + name = "_babel_code_frame___code_frame_7.8.3.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz"; - sha1 = "06e2ab19bdb535385559aabb5ba59729482800f8"; + name = "_babel_code_frame___code_frame_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz"; + sha1 = "33e25903d7481181534e12ec0a25f16b6fcf419e"; }; } { - name = "_babel_generator___generator_7.2.2.tgz"; + name = "_babel_generator___generator_7.9.6.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.2.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.2.2.tgz"; - sha1 = "18c816c70962640eab42fe8cae5f3947a5c65ccc"; + name = "_babel_generator___generator_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz"; + sha1 = "5408c82ac5de98cda0d77d8124e99fa1f2170a43"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.9.5.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz"; - sha1 = "a0ceb01685f73355d4360c1247f582bfafc8ff53"; + name = "_babel_helper_function_name___helper_function_name_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz"; + sha1 = "2b53820d35275120e1874a82e5aabe1376920a5c"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz"; - sha1 = "83572d4320e2a4657263734113c42868b64e49c3"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz"; + sha1 = "b894b947bd004381ce63ea1db9f08547e920abd5"; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.0.0.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz"; - sha1 = "3aae285c0311c2ab095d997b8c9a94cad547d813"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz"; + sha1 = "31a9f30070f91368a7182cf05f831781065fc7a9"; }; } { - name = "_babel_highlight___highlight_7.0.0.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.5.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz"; - sha1 = "f710c38c8d458e6dd9a201afb637fcb781ce99e4"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz"; + sha1 = "90977a8e6fbf6b431a7dc31752eee233bf052d80"; }; } { - name = "_babel_parser___parser_7.2.3.tgz"; + name = "_babel_highlight___highlight_7.9.0.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.2.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.2.3.tgz"; - sha1 = "32f5df65744b70888d17872ec106b02434ba1489"; + name = "_babel_highlight___highlight_7.9.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz"; + sha1 = "4e9b45ccb82b79607271b2979ad82c7b68163079"; }; } { - name = "_babel_template___template_7.2.2.tgz"; + name = "_babel_parser___parser_7.9.6.tgz"; path = fetchurl { - name = "_babel_template___template_7.2.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz"; - sha1 = "005b3fdf0ed96e88041330379e0da9a708eb2907"; + name = "_babel_parser___parser_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz"; + sha1 = "3b1bbb30dabe600cd72db58720998376ff653bc7"; }; } { - name = "_babel_traverse___traverse_7.2.3.tgz"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.9.6.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.2.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.3.tgz"; - sha1 = "7ff50cefa9c7c0bd2d81231fdac122f3957748d8"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz"; + sha1 = "67aded13fffbbc2cb93247388cf84d77a4be9a71"; }; } { - name = "_babel_types___types_7.2.2.tgz"; + name = "_babel_runtime___runtime_7.9.6.tgz"; path = fetchurl { - name = "_babel_types___types_7.2.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.2.2.tgz"; - sha1 = "44e10fc24e33af524488b716cdaee5360ea8ed1e"; + name = "_babel_runtime___runtime_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz"; + sha1 = "a9102eb5cadedf3f31d08a9ecf294af7827ea29f"; }; } { - name = "_iamstarkov_listr_update_renderer___listr_update_renderer_0.4.1.tgz"; + name = "_babel_template___template_7.8.6.tgz"; path = fetchurl { - name = "_iamstarkov_listr_update_renderer___listr_update_renderer_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/@iamstarkov/listr-update-renderer/-/listr-update-renderer-0.4.1.tgz"; - sha1 = "d7c48092a2dcf90fd672b6c8b458649cb350c77e"; + name = "_babel_template___template_7.8.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz"; + sha1 = "86b22af15f828dfb086474f964dcc3e39c43ce2b"; + }; + } + { + name = "_babel_traverse___traverse_7.9.6.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz"; + sha1 = "5540d7577697bf619cc57b92aa0f1c231a94f442"; + }; + } + { + name = "_babel_types___types_7.9.6.tgz"; + path = fetchurl { + name = "_babel_types___types_7.9.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz"; + sha1 = "2c5502b427251e9de1bd2dff95add646d95cc9f7"; }; } { @@ -122,11 +138,11 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.0.1.tgz"; + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz"; - sha1 = "32a064fd925429216a09b141102bfdd185fae40e"; + name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; + sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe"; }; } { @@ -138,19 +154,19 @@ }; } { - name = "acorn___acorn_5.7.3.tgz"; + name = "acorn___acorn_5.7.4.tgz"; path = fetchurl { - name = "acorn___acorn_5.7.3.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz"; - sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279"; + name = "acorn___acorn_5.7.4.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz"; + sha1 = "3e8d8a9947d0599a1796d10225d7432f4a4acf5e"; }; } { - name = "acorn___acorn_6.0.5.tgz"; + name = "acorn___acorn_6.4.1.tgz"; path = fetchurl { - name = "acorn___acorn_6.0.5.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-6.0.5.tgz"; - sha1 = "81730c0815f3f3b34d8efa95cb7430965f4d887a"; + name = "acorn___acorn_6.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz"; + sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474"; }; } { @@ -170,19 +186,19 @@ }; } { - name = "ajv___ajv_6.6.2.tgz"; + name = "ajv___ajv_6.12.2.tgz"; path = fetchurl { - name = "ajv___ajv_6.6.2.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz"; - sha1 = "caceccf474bf3fc3ce3b147443711a24063cc30d"; + name = "ajv___ajv_6.12.2.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz"; + sha1 = "c629c5eced17baf314437918d2da88c99d5958cd"; }; } { - name = "ansi_escapes___ansi_escapes_3.1.0.tgz"; + name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; path = fetchurl { - name = "ansi_escapes___ansi_escapes_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz"; - sha1 = "f73207bb81207d75fd6c83f125af26eea378ca30"; + name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"; }; } { @@ -202,11 +218,11 @@ }; } { - name = "ansi_regex___ansi_regex_4.0.0.tgz"; + name = "ansi_regex___ansi_regex_4.1.0.tgz"; path = fetchurl { - name = "ansi_regex___ansi_regex_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz"; - sha1 = "70de791edf021404c3fd615aa89118ae0432e5a9"; + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; }; } { @@ -274,11 +290,11 @@ }; } { - name = "array_includes___array_includes_3.0.3.tgz"; + name = "array_includes___array_includes_3.1.1.tgz"; path = fetchurl { - name = "array_includes___array_includes_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz"; - sha1 = "184b48f62d92d7452bb31b323165c7f8bd02266d"; + name = "array_includes___array_includes_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz"; + sha1 = "cdd67e6852bdf9c1215460786732255ed2459348"; }; } { @@ -305,6 +321,14 @@ sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; }; } + { + name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; + path = fetchurl { + name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz"; + sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b"; + }; + } { name = "arrify___arrify_1.0.1.tgz"; path = fetchurl { @@ -346,11 +370,11 @@ }; } { - name = "axobject_query___axobject_query_2.0.2.tgz"; + name = "axobject_query___axobject_query_2.1.2.tgz"; path = fetchurl { - name = "axobject_query___axobject_query_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz"; - sha1 = "ea187abe5b9002b377f925d8bf7d1c561adf38f9"; + name = "axobject_query___axobject_query_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz"; + sha1 = "2bdffc0371e643e5f03ba99065d5179b9ca79799"; }; } { @@ -362,11 +386,11 @@ }; } { - name = "babel_eslint___babel_eslint_10.0.1.tgz"; + name = "babel_eslint___babel_eslint_10.1.0.tgz"; path = fetchurl { - name = "babel_eslint___babel_eslint_10.0.1.tgz"; - url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.1.tgz"; - sha1 = "919681dc099614cd7d31d45c8908695092a1faed"; + name = "babel_eslint___babel_eslint_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz"; + sha1 = "6968e568a910b78fb3779cdd8b6ac2f479943232"; }; } { @@ -425,14 +449,6 @@ sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; }; } - { - name = "builtin_modules___builtin_modules_1.1.1.tgz"; - path = fetchurl { - name = "builtin_modules___builtin_modules_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; - }; - } { name = "cache_base___cache_base_1.0.1.tgz"; path = fetchurl { @@ -482,11 +498,11 @@ }; } { - name = "callsites___callsites_3.0.0.tgz"; + name = "callsites___callsites_3.1.0.tgz"; path = fetchurl { - name = "callsites___callsites_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz"; - sha1 = "fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"; + name = "callsites___callsites_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; + sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; }; } { @@ -522,11 +538,11 @@ }; } { - name = "chalk___chalk_2.4.1.tgz"; + name = "chalk___chalk_2.4.2.tgz"; path = fetchurl { - name = "chalk___chalk_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz"; - sha1 = "18c49ab16a037b6eb0152cc83e3471338215b66e"; + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; }; } { @@ -586,11 +602,11 @@ }; } { - name = "cli_width___cli_width_2.2.0.tgz"; + name = "cli_width___cli_width_2.2.1.tgz"; path = fetchurl { - name = "cli_width___cli_width_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz"; - sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + name = "cli_width___cli_width_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz"; + sha1 = "b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"; }; } { @@ -642,11 +658,11 @@ }; } { - name = "commander___commander_2.19.0.tgz"; + name = "commander___commander_2.20.3.tgz"; path = fetchurl { - name = "commander___commander_2.19.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz"; - sha1 = "f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"; + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; }; } { @@ -658,11 +674,11 @@ }; } { - name = "component_emitter___component_emitter_1.2.1.tgz"; + name = "component_emitter___component_emitter_1.3.0.tgz"; path = fetchurl { - name = "component_emitter___component_emitter_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz"; - sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + name = "component_emitter___component_emitter_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz"; + sha1 = "16e4070fba8ae29b679f2215853ee181ab2eabc0"; }; } { @@ -681,6 +697,14 @@ sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; }; } + { + name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz"; + path = fetchurl { + name = "confusing_browser_globals___confusing_browser_globals_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz"; + sha1 = "72bc13b483c0276801681871d4898516f8f54fdd"; + }; + } { name = "contains_path___contains_path_0.1.0.tgz"; path = fetchurl { @@ -698,11 +722,19 @@ }; } { - name = "core_js___core_js_2.6.1.tgz"; + name = "core_js_pure___core_js_pure_3.6.5.tgz"; path = fetchurl { - name = "core_js___core_js_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.1.tgz"; - sha1 = "87416ae817de957a3f249b3b5ca475d4aaed6042"; + name = "core_js_pure___core_js_pure_3.6.5.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz"; + sha1 = "c79e75f5e38dbc85a662d91eea52b8256d53b813"; + }; + } + { + name = "core_js___core_js_2.6.11.tgz"; + path = fetchurl { + name = "core_js___core_js_2.6.11.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz"; + sha1 = "38831469f9922bded8ee21c9dc46985e0399308c"; }; } { @@ -714,19 +746,11 @@ }; } { - name = "cosmiconfig___cosmiconfig_5.0.6.tgz"; + name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; path = fetchurl { - name = "cosmiconfig___cosmiconfig_5.0.6.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz"; - sha1 = "dca6cf680a0bd03589aff684700858c81abeeb39"; - }; - } - { - name = "cosmiconfig___cosmiconfig_5.0.7.tgz"; - path = fetchurl { - name = "cosmiconfig___cosmiconfig_5.0.7.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz"; - sha1 = "39826b292ee0d78eda137dfa3173bd1c21a43b04"; + name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; + sha1 = "040f726809c591e77a17c0a3626ca45b4f168b1a"; }; } { @@ -746,11 +770,11 @@ }; } { - name = "damerau_levenshtein___damerau_levenshtein_1.0.4.tgz"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; path = fetchurl { - name = "damerau_levenshtein___damerau_levenshtein_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz"; - sha1 = "03191c432cb6eea168bb77f3a55ffdccb8978514"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz"; + sha1 = "143c1641cb3d85c60c32329e26899adea8701791"; }; } { @@ -810,11 +834,11 @@ }; } { - name = "deep_equal___deep_equal_1.0.1.tgz"; + name = "deep_equal___deep_equal_1.1.1.tgz"; path = fetchurl { - name = "deep_equal___deep_equal_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz"; - sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; + name = "deep_equal___deep_equal_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz"; + sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a"; }; } { @@ -866,11 +890,11 @@ }; } { - name = "dlv___dlv_1.1.2.tgz"; + name = "dlv___dlv_1.1.3.tgz"; path = fetchurl { - name = "dlv___dlv_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/dlv/-/dlv-1.1.2.tgz"; - sha1 = "270f6737b30d25b6657a7e962c784403f85137e5"; + name = "dlv___dlv_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz"; + sha1 = "5c198a8a11453596e751494d49874bc7732f2e79"; }; } { @@ -897,6 +921,14 @@ sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d"; }; } + { + name = "doctrine___doctrine_3.0.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; + sha1 = "addebead72a6574db783639dc87a121773973961"; + }; + } { name = "elegant_spinner___elegant_spinner_1.0.1.tgz"; path = fetchurl { @@ -906,19 +938,19 @@ }; } { - name = "emoji_regex___emoji_regex_6.5.1.tgz"; + name = "emoji_regex___emoji_regex_7.0.3.tgz"; path = fetchurl { - name = "emoji_regex___emoji_regex_6.5.1.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.5.1.tgz"; - sha1 = "9baea929b155565c11ea41c6626eaa65cef992c2"; + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha1 = "933a04052860c85e83c122479c4748a8e4c72156"; }; } { - name = "end_of_stream___end_of_stream_1.4.1.tgz"; + name = "end_of_stream___end_of_stream_1.4.4.tgz"; path = fetchurl { - name = "end_of_stream___end_of_stream_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz"; - sha1 = "ed29634d19baba463b6ce6b80a37213eab71ec43"; + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; }; } { @@ -930,19 +962,19 @@ }; } { - name = "es_abstract___es_abstract_1.13.0.tgz"; + name = "es_abstract___es_abstract_1.17.5.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz"; - sha1 = "ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"; + name = "es_abstract___es_abstract_1.17.5.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz"; + sha1 = "d8c9d1d66c8981fb9200e2251d799eee92774ae9"; }; } { - name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; path = fetchurl { - name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; - sha1 = "edf72478033456e8dda8ef09e00ad9650707f377"; + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; }; } { @@ -954,27 +986,27 @@ }; } { - name = "eslint_config_airbnb_base___eslint_config_airbnb_base_13.1.0.tgz"; + name = "eslint_config_airbnb_base___eslint_config_airbnb_base_13.2.0.tgz"; path = fetchurl { - name = "eslint_config_airbnb_base___eslint_config_airbnb_base_13.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.1.0.tgz"; - sha1 = "b5a1b480b80dfad16433d6c4ad84e6605052c05c"; + name = "eslint_config_airbnb_base___eslint_config_airbnb_base_13.2.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.2.0.tgz"; + sha1 = "f6ea81459ff4dec2dda200c35f1d8f7419d57943"; }; } { - name = "eslint_config_airbnb___eslint_config_airbnb_17.1.0.tgz"; + name = "eslint_config_airbnb___eslint_config_airbnb_17.1.1.tgz"; path = fetchurl { - name = "eslint_config_airbnb___eslint_config_airbnb_17.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-17.1.0.tgz"; - sha1 = "3964ed4bc198240315ff52030bf8636f42bc4732"; + name = "eslint_config_airbnb___eslint_config_airbnb_17.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-17.1.1.tgz"; + sha1 = "2272e0b86bb1e2b138cdf88d07a3b6f4cda3d626"; }; } { - name = "eslint_config_prettier___eslint_config_prettier_3.3.0.tgz"; + name = "eslint_config_prettier___eslint_config_prettier_3.6.0.tgz"; path = fetchurl { - name = "eslint_config_prettier___eslint_config_prettier_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.3.0.tgz"; - sha1 = "41afc8d3b852e757f06274ed6c44ca16f939a57d"; + name = "eslint_config_prettier___eslint_config_prettier_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.6.0.tgz"; + sha1 = "8ca3ffac4bd6eeef623a0651f9d754900e3ec217"; }; } { @@ -986,43 +1018,43 @@ }; } { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz"; path = fetchurl { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz"; - sha1 = "58f15fb839b8d0576ca980413476aab2472db66a"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz"; + sha1 = "dbaa52b6b2816b50bc6711af75422de808e98404"; }; } { - name = "eslint_module_utils___eslint_module_utils_2.2.0.tgz"; + name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz"; - sha1 = "b270362cd88b1a48ad308976ce7fa54e98411746"; + name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; + sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6"; }; } { - name = "eslint_plugin_es___eslint_plugin_es_1.4.0.tgz"; + name = "eslint_plugin_es___eslint_plugin_es_1.4.1.tgz"; path = fetchurl { - name = "eslint_plugin_es___eslint_plugin_es_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.0.tgz"; - sha1 = "475f65bb20c993fc10e8c8fe77d1d60068072da6"; + name = "eslint_plugin_es___eslint_plugin_es_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.1.tgz"; + sha1 = "12acae0f4953e76ba444bfd1b2271081ac620998"; }; } { - name = "eslint_plugin_import___eslint_plugin_import_2.14.0.tgz"; + name = "eslint_plugin_import___eslint_plugin_import_2.20.2.tgz"; path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.14.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz"; - sha1 = "6b17626d2e3e6ad52cfce8807a845d15e22111a8"; + name = "eslint_plugin_import___eslint_plugin_import_2.20.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz"; + sha1 = "91fc3807ce08be4837141272c8b99073906e588d"; }; } { - name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.1.2.tgz"; + name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.2.3.tgz"; path = fetchurl { - name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.1.2.tgz"; - sha1 = "69bca4890b36dcf0fe16dd2129d2d88b98f33f88"; + name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.2.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz"; + sha1 = "b872a09d5de51af70a97db1eea7dc933043708aa"; }; } { @@ -1034,43 +1066,27 @@ }; } { - name = "eslint_plugin_promise___eslint_plugin_promise_4.0.1.tgz"; + name = "eslint_plugin_promise___eslint_plugin_promise_4.2.1.tgz"; path = fetchurl { - name = "eslint_plugin_promise___eslint_plugin_promise_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.0.1.tgz"; - sha1 = "2d074b653f35a23d1ba89d8e976a985117d1c6a2"; + name = "eslint_plugin_promise___eslint_plugin_promise_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz"; + sha1 = "845fd8b2260ad8f82564c1222fce44ad71d9418a"; }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.12.3.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.20.0.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.12.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.12.3.tgz"; - sha1 = "b9ca4cd7cd3f5d927db418a1950366a12d4568fd"; + name = "eslint_plugin_react___eslint_plugin_react_7.20.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz"; + sha1 = "f98712f0a5e57dfd3e5542ef0604b8739cd47be3"; }; } { - name = "eslint_plugin_standard___eslint_plugin_standard_4.0.0.tgz"; + name = "eslint_plugin_standard___eslint_plugin_standard_4.0.1.tgz"; path = fetchurl { - name = "eslint_plugin_standard___eslint_plugin_standard_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.0.tgz"; - sha1 = "f845b45109c99cd90e77796940a344546c8f6b5c"; - }; - } - { - name = "eslint_restricted_globals___eslint_restricted_globals_0.1.1.tgz"; - path = fetchurl { - name = "eslint_restricted_globals___eslint_restricted_globals_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz"; - sha1 = "35f0d5cbc64c2e3ed62e93b4b1a7af05ba7ed4d7"; - }; - } - { - name = "eslint_scope___eslint_scope_3.7.1.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz"; - sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; + name = "eslint_plugin_standard___eslint_plugin_standard_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz"; + sha1 = "ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4"; }; } { @@ -1082,27 +1098,27 @@ }; } { - name = "eslint_scope___eslint_scope_4.0.0.tgz"; + name = "eslint_scope___eslint_scope_4.0.3.tgz"; path = fetchurl { - name = "eslint_scope___eslint_scope_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz"; - sha1 = "50bf3071e9338bcdc43331794a0cb533f0136172"; + name = "eslint_scope___eslint_scope_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz"; + sha1 = "ca03833310f6889a3264781aa82e63eb9cfe7848"; }; } { - name = "eslint_utils___eslint_utils_1.3.1.tgz"; + name = "eslint_utils___eslint_utils_1.4.3.tgz"; path = fetchurl { - name = "eslint_utils___eslint_utils_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz"; - sha1 = "9a851ba89ee7c460346f97cf8939c7298827e512"; + name = "eslint_utils___eslint_utils_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz"; + sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f"; }; } { - name = "eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz"; - sha1 = "3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"; + name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; + sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2"; }; } { @@ -1114,11 +1130,11 @@ }; } { - name = "eslint___eslint_5.12.0.tgz"; + name = "eslint___eslint_5.16.0.tgz"; path = fetchurl { - name = "eslint___eslint_5.12.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-5.12.0.tgz"; - sha1 = "fab3b908f60c52671fb14e996a450b96c743c859"; + name = "eslint___eslint_5.16.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz"; + sha1 = "a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"; }; } { @@ -1130,11 +1146,11 @@ }; } { - name = "espree___espree_5.0.0.tgz"; + name = "espree___espree_5.0.1.tgz"; path = fetchurl { - name = "espree___espree_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-5.0.0.tgz"; - sha1 = "fc7f984b62b36a0f543b13fb9cd7b9f4a7f5b65c"; + name = "espree___espree_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz"; + sha1 = "5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"; }; } { @@ -1146,11 +1162,11 @@ }; } { - name = "esquery___esquery_1.0.1.tgz"; + name = "esquery___esquery_1.3.1.tgz"; path = fetchurl { - name = "esquery___esquery_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz"; - sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708"; + name = "esquery___esquery_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; + sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; }; } { @@ -1162,19 +1178,27 @@ }; } { - name = "estraverse___estraverse_4.2.0.tgz"; + name = "estraverse___estraverse_4.3.0.tgz"; path = fetchurl { - name = "estraverse___estraverse_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz"; - sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; }; } { - name = "esutils___esutils_2.0.2.tgz"; + name = "estraverse___estraverse_5.1.0.tgz"; path = fetchurl { - name = "esutils___esutils_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz"; - sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; + name = "estraverse___estraverse_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz"; + sha1 = "374309d39fd935ae500e7b92e8a6b4c720e59642"; + }; + } + { + name = "esutils___esutils_2.0.3.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; + sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; }; } { @@ -1226,11 +1250,11 @@ }; } { - name = "external_editor___external_editor_3.0.3.tgz"; + name = "external_editor___external_editor_3.1.0.tgz"; path = fetchurl { - name = "external_editor___external_editor_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz"; - sha1 = "5866db29a97826dbe4bf3afd24070ead9ea43a27"; + name = "external_editor___external_editor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz"; + sha1 = "cb03f740befae03ea4d283caed2741a83f335495"; }; } { @@ -1250,19 +1274,19 @@ }; } { - name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; + name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; - sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; + sha1 = "545145077c501491e33b15ec408c294376e94ae4"; }; } { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; path = fetchurl { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; }; } { @@ -1297,6 +1321,14 @@ sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; } + { + name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; + sha1 = "ca0f6efa6dd3d561333fb14515065c2fafdf439c"; + }; + } { name = "fill_range___fill_range_4.0.0.tgz"; path = fetchurl { @@ -1305,22 +1337,6 @@ sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; }; } - { - name = "find_parent_dir___find_parent_dir_0.3.0.tgz"; - path = fetchurl { - name = "find_parent_dir___find_parent_dir_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz"; - sha1 = "33c44b429ab2b2f0646299c5f9f718f376ff8d54"; - }; - } - { - name = "find_up___find_up_1.1.2.tgz"; - path = fetchurl { - name = "find_up___find_up_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz"; - sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; - }; - } { name = "find_up___find_up_2.1.0.tgz"; path = fetchurl { @@ -1345,6 +1361,30 @@ sha1 = "2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"; }; } + { + name = "flat_cache___flat_cache_2.0.1.tgz"; + path = fetchurl { + name = "flat_cache___flat_cache_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz"; + sha1 = "5d296d6f04bda44a4630a301413bdbc2ec085ec0"; + }; + } + { + name = "flatted___flatted_2.0.2.tgz"; + path = fetchurl { + name = "flatted___flatted_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz"; + sha1 = "4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"; + }; + } + { + name = "fn_name___fn_name_2.0.1.tgz"; + path = fetchurl { + name = "fn_name___fn_name_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz"; + sha1 = "5214d7537a4d06a4a301c0cc262feb84188002e7"; + }; + } { name = "for_in___for_in_1.0.2.tgz"; path = fetchurl { @@ -1402,11 +1442,11 @@ }; } { - name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.0.tgz"; + name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; path = fetchurl { - name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz"; - sha1 = "b877b49a5c16aefac3655f2ed2ea5b684df8d203"; + name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; + sha1 = "b5fde77f22cbe35f390b4e089922c50bce6ef664"; }; } { @@ -1450,11 +1490,11 @@ }; } { - name = "glob___glob_7.1.3.tgz"; + name = "glob___glob_7.1.6.tgz"; path = fetchurl { - name = "glob___glob_7.1.3.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz"; - sha1 = "3960832d3f1574108342dafd3a67b332c0969df1"; + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; }; } { @@ -1466,11 +1506,11 @@ }; } { - name = "globals___globals_11.9.0.tgz"; + name = "globals___globals_11.12.0.tgz"; path = fetchurl { - name = "globals___globals_11.9.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz"; - sha1 = "bde236808e987f290768a93d065060d78e6ab249"; + name = "globals___globals_11.12.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz"; + sha1 = "ab8795338868a0babd8525758018c2a7eb95c42e"; }; } { @@ -1482,11 +1522,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.1.15.tgz"; + name = "graceful_fs___graceful_fs_4.2.4.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.1.15.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz"; - sha1 = "ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"; + name = "graceful_fs___graceful_fs_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; }; } { @@ -1514,11 +1554,11 @@ }; } { - name = "has_symbols___has_symbols_1.0.0.tgz"; + name = "has_symbols___has_symbols_1.0.1.tgz"; path = fetchurl { - name = "has_symbols___has_symbols_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz"; - sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + name = "has_symbols___has_symbols_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; + sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; }; } { @@ -1562,11 +1602,11 @@ }; } { - name = "hosted_git_info___hosted_git_info_2.7.1.tgz"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz"; - sha1 = "97f236977bd6e125408930ff6de3eec6281ec047"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; + sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488"; }; } { @@ -1602,11 +1642,11 @@ }; } { - name = "ignore___ignore_5.0.4.tgz"; + name = "ignore___ignore_5.1.4.tgz"; path = fetchurl { - name = "ignore___ignore_5.0.4.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-5.0.4.tgz"; - sha1 = "33168af4a21e99b00c5d41cbadb6a6cb49903a45"; + name = "ignore___ignore_5.1.4.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz"; + sha1 = "84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"; }; } { @@ -1618,11 +1658,11 @@ }; } { - name = "import_fresh___import_fresh_3.0.0.tgz"; + name = "import_fresh___import_fresh_3.2.1.tgz"; path = fetchurl { - name = "import_fresh___import_fresh_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.0.0.tgz"; - sha1 = "a3d897f420cab0e671236897f75bc14b4885c390"; + name = "import_fresh___import_fresh_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; + sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; }; } { @@ -1650,11 +1690,11 @@ }; } { - name = "inherits___inherits_2.0.3.tgz"; + name = "inherits___inherits_2.0.4.tgz"; path = fetchurl { - name = "inherits___inherits_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; }; } { @@ -1666,11 +1706,19 @@ }; } { - name = "inquirer___inquirer_6.2.1.tgz"; + name = "inquirer___inquirer_6.5.2.tgz"; path = fetchurl { - name = "inquirer___inquirer_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz"; - sha1 = "9943fc4882161bdb0b0c9276769c75b32dbfcd52"; + name = "inquirer___inquirer_6.5.2.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz"; + sha1 = "ad50942375d036d327ff528c08bd5fab089928ca"; + }; + } + { + name = "internal_slot___internal_slot_1.0.2.tgz"; + path = fetchurl { + name = "internal_slot___internal_slot_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz"; + sha1 = "9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"; }; } { @@ -1697,6 +1745,14 @@ sha1 = "169c2f6d3df1f992618072365c9b0ea1f6878656"; }; } + { + name = "is_arguments___is_arguments_1.0.4.tgz"; + path = fetchurl { + name = "is_arguments___is_arguments_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz"; + sha1 = "3faf966c7cba0ff437fb31f6250082fcf0448cf3"; + }; + } { name = "is_arrayish___is_arrayish_0.2.1.tgz"; path = fetchurl { @@ -1714,19 +1770,11 @@ }; } { - name = "is_builtin_module___is_builtin_module_1.0.0.tgz"; + name = "is_callable___is_callable_1.1.5.tgz"; path = fetchurl { - name = "is_builtin_module___is_builtin_module_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; - }; - } - { - name = "is_callable___is_callable_1.1.4.tgz"; - path = fetchurl { - name = "is_callable___is_callable_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz"; - sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"; + name = "is_callable___is_callable_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz"; + sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab"; }; } { @@ -1754,11 +1802,11 @@ }; } { - name = "is_date_object___is_date_object_1.0.1.tgz"; + name = "is_date_object___is_date_object_1.0.2.tgz"; path = fetchurl { - name = "is_date_object___is_date_object_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz"; - sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + name = "is_date_object___is_date_object_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz"; + sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"; }; } { @@ -1826,11 +1874,11 @@ }; } { - name = "is_glob___is_glob_4.0.0.tgz"; + name = "is_glob___is_glob_4.0.1.tgz"; path = fetchurl { - name = "is_glob___is_glob_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz"; - sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0"; + name = "is_glob___is_glob_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; + sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; }; } { @@ -1890,19 +1938,19 @@ }; } { - name = "is_promise___is_promise_2.1.0.tgz"; + name = "is_promise___is_promise_2.2.2.tgz"; path = fetchurl { - name = "is_promise___is_promise_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + name = "is_promise___is_promise_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz"; + sha1 = "39ab959ccbf9a774cf079f7b40c7a26f763135f1"; }; } { - name = "is_regex___is_regex_1.0.4.tgz"; + name = "is_regex___is_regex_1.0.5.tgz"; path = fetchurl { - name = "is_regex___is_regex_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz"; - sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + name = "is_regex___is_regex_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz"; + sha1 = "39d589a358bf18967f726967120b8fc1aed74eae"; }; } { @@ -1930,11 +1978,19 @@ }; } { - name = "is_symbol___is_symbol_1.0.2.tgz"; + name = "is_string___is_string_1.0.5.tgz"; path = fetchurl { - name = "is_symbol___is_symbol_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz"; - sha1 = "a055f6ae57192caee329e7a860118b497a950f38"; + name = "is_string___is_string_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz"; + sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"; + }; + } + { + name = "is_symbol___is_symbol_1.0.3.tgz"; + path = fetchurl { + name = "is_symbol___is_symbol_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; + sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937"; }; } { @@ -1977,22 +2033,6 @@ sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; }; } - { - name = "jest_get_type___jest_get_type_22.4.3.tgz"; - path = fetchurl { - name = "jest_get_type___jest_get_type_22.4.3.tgz"; - url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz"; - sha1 = "e3a8504d8479342dd4420236b322869f18900ce4"; - }; - } - { - name = "jest_validate___jest_validate_23.6.0.tgz"; - path = fetchurl { - name = "jest_validate___jest_validate_23.6.0.tgz"; - url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.6.0.tgz"; - sha1 = "36761f99d1ed33fcd425b4e4c5595d62b6597474"; - }; - } { name = "js_tokens___js_tokens_4.0.0.tgz"; path = fetchurl { @@ -2010,11 +2050,11 @@ }; } { - name = "js_yaml___js_yaml_3.12.1.tgz"; + name = "js_yaml___js_yaml_3.13.1.tgz"; path = fetchurl { - name = "js_yaml___js_yaml_3.12.1.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz"; - sha1 = "295c8632a18a23e054cf5c9d3cecafe678167600"; + name = "js_yaml___js_yaml_3.13.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz"; + sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847"; }; } { @@ -2058,11 +2098,11 @@ }; } { - name = "jsx_ast_utils___jsx_ast_utils_2.0.1.tgz"; + name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; path = fetchurl { - name = "jsx_ast_utils___jsx_ast_utils_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz"; - sha1 = "e801b1b39985e20fffc87b40e3748080e2dcac7f"; + name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz"; + sha1 = "8a9364e402448a3ce7f14d357738310d9248054f"; }; } { @@ -2090,11 +2130,11 @@ }; } { - name = "kind_of___kind_of_6.0.2.tgz"; + name = "kind_of___kind_of_6.0.3.tgz"; path = fetchurl { - name = "kind_of___kind_of_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz"; - sha1 = "01146b36a6218e64e58f3a8d66de5d7fc6f6d051"; + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; }; } { @@ -2105,14 +2145,6 @@ sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; }; } - { - name = "leven___leven_2.1.0.tgz"; - path = fetchurl { - name = "leven___leven_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz"; - sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; - }; - } { name = "levn___levn_0.3.0.tgz"; path = fetchurl { @@ -2122,11 +2154,11 @@ }; } { - name = "lint_staged___lint_staged_8.1.0.tgz"; + name = "lint_staged___lint_staged_8.2.1.tgz"; path = fetchurl { - name = "lint_staged___lint_staged_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.1.0.tgz"; - sha1 = "dbc3ae2565366d8f20efb9f9799d076da64863f2"; + name = "lint_staged___lint_staged_8.2.1.tgz"; + url = "https://registry.yarnpkg.com/lint-staged/-/lint-staged-8.2.1.tgz"; + sha1 = "752fcf222d9d28f323a3b80f1e668f3654ff221f"; }; } { @@ -2194,11 +2226,11 @@ }; } { - name = "lodash.merge___lodash.merge_4.6.1.tgz"; + name = "lodash.merge___lodash.merge_4.6.2.tgz"; path = fetchurl { - name = "lodash.merge___lodash.merge_4.6.1.tgz"; - url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz"; - sha1 = "adc25d9cb99b9391c59624f379fbba60d7111d54"; + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a"; }; } { @@ -2210,11 +2242,11 @@ }; } { - name = "lodash___lodash_4.17.11.tgz"; + name = "lodash___lodash_4.17.15.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.11.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz"; - sha1 = "b39ea6229ef607ecd89e2c8df12536891cac9b8d"; + name = "lodash___lodash_4.17.15.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; + sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; }; } { @@ -2250,11 +2282,11 @@ }; } { - name = "loglevel___loglevel_1.6.1.tgz"; + name = "loglevel___loglevel_1.6.8.tgz"; path = fetchurl { - name = "loglevel___loglevel_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz"; - sha1 = "e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"; + name = "loglevel___loglevel_1.6.8.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz"; + sha1 = "8a25fb75d092230ecd4457270d80b54e28011171"; }; } { @@ -2362,35 +2394,27 @@ }; } { - name = "minimist___minimist_0.0.8.tgz"; + name = "minimist___minimist_1.2.5.tgz"; path = fetchurl { - name = "minimist___minimist_0.0.8.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; }; } { - name = "minimist___minimist_1.2.0.tgz"; + name = "mixin_deep___mixin_deep_1.3.2.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz"; + sha1 = "1120b43dc359a785dce65b55b82e257ccf479566"; }; } { - name = "mixin_deep___mixin_deep_1.3.1.tgz"; + name = "mkdirp___mkdirp_0.5.5.tgz"; path = fetchurl { - name = "mixin_deep___mixin_deep_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz"; - sha1 = "a49e7268dce1a0d9698e45326c5626df3543d0fe"; - }; - } - { - name = "mkdirp___mkdirp_0.5.1.tgz"; - path = fetchurl { - name = "mkdirp___mkdirp_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; }; } { @@ -2402,11 +2426,11 @@ }; } { - name = "ms___ms_2.1.1.tgz"; + name = "ms___ms_2.1.2.tgz"; path = fetchurl { - name = "ms___ms_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; - sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"; + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; }; } { @@ -2450,11 +2474,11 @@ }; } { - name = "normalize_package_data___normalize_package_data_2.4.0.tgz"; + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; path = fetchurl { - name = "normalize_package_data___normalize_package_data_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha1 = "12f95a307d58352075a04907b84ac8be98ac012f"; + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; }; } { @@ -2506,11 +2530,27 @@ }; } { - name = "object_keys___object_keys_1.0.12.tgz"; + name = "object_inspect___object_inspect_1.7.0.tgz"; path = fetchurl { - name = "object_keys___object_keys_1.0.12.tgz"; - url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz"; - sha1 = "09c53855377575310cca62f55bb334abff7b3ed2"; + name = "object_inspect___object_inspect_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz"; + sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"; + }; + } + { + name = "object_is___object_is_1.1.2.tgz"; + path = fetchurl { + name = "object_is___object_is_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz"; + sha1 = "c5d2e87ff9e119f78b7a088441519e2eec1573b6"; + }; + } + { + name = "object_keys___object_keys_1.1.1.tgz"; + path = fetchurl { + name = "object_keys___object_keys_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; + sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; }; } { @@ -2530,19 +2570,19 @@ }; } { - name = "object.entries___object.entries_1.1.0.tgz"; + name = "object.entries___object.entries_1.1.1.tgz"; path = fetchurl { - name = "object.entries___object.entries_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz"; - sha1 = "2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519"; + name = "object.entries___object.entries_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz"; + sha1 = "ee1cf04153de02bb093fec33683900f57ce5399b"; }; } { - name = "object.fromentries___object.fromentries_2.0.0.tgz"; + name = "object.fromentries___object.fromentries_2.0.2.tgz"; path = fetchurl { - name = "object.fromentries___object.fromentries_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.0.tgz"; - sha1 = "49a543d92151f8277b3ac9600f1e930b189d30ab"; + name = "object.fromentries___object.fromentries_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz"; + sha1 = "4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"; }; } { @@ -2553,6 +2593,14 @@ sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; }; } + { + name = "object.values___object.values_1.1.1.tgz"; + path = fetchurl { + name = "object.values___object.values_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; + sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; + }; + } { name = "once___once_1.4.0.tgz"; path = fetchurl { @@ -2570,11 +2618,11 @@ }; } { - name = "optionator___optionator_0.8.2.tgz"; + name = "optionator___optionator_0.8.3.tgz"; path = fetchurl { - name = "optionator___optionator_0.8.2.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz"; - sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; + name = "optionator___optionator_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; + sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; }; } { @@ -2610,11 +2658,11 @@ }; } { - name = "p_limit___p_limit_2.1.0.tgz"; + name = "p_limit___p_limit_2.3.0.tgz"; path = fetchurl { - name = "p_limit___p_limit_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.1.0.tgz"; - sha1 = "1d5a0d20fb12707c758a655f6bbc4386b5930d68"; + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; }; } { @@ -2642,11 +2690,11 @@ }; } { - name = "p_map___p_map_2.0.0.tgz"; + name = "p_map___p_map_2.1.0.tgz"; path = fetchurl { - name = "p_map___p_map_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-map/-/p-map-2.0.0.tgz"; - sha1 = "be18c5a5adeb8e156460651421aceca56c213a50"; + name = "p_map___p_map_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz"; + sha1 = "310928feef9c9ecc65b68b17693018a665cea175"; }; } { @@ -2658,19 +2706,19 @@ }; } { - name = "p_try___p_try_2.0.0.tgz"; + name = "p_try___p_try_2.2.0.tgz"; path = fetchurl { - name = "p_try___p_try_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz"; - sha1 = "85080bb87c64688fa47996fe8f7dfbe8211760b1"; + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; }; } { - name = "parent_module___parent_module_1.0.0.tgz"; + name = "parent_module___parent_module_1.0.1.tgz"; path = fetchurl { - name = "parent_module___parent_module_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.0.tgz"; - sha1 = "df250bdc5391f4a085fb589dad761f5ad6b865b5"; + name = "parent_module___parent_module_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; + sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; }; } { @@ -2697,14 +2745,6 @@ sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; }; } - { - name = "path_exists___path_exists_2.1.0.tgz"; - path = fetchurl { - name = "path_exists___path_exists_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz"; - sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; - }; - } { name = "path_exists___path_exists_3.0.0.tgz"; path = fetchurl { @@ -2786,11 +2826,11 @@ }; } { - name = "pkg_dir___pkg_dir_1.0.0.tgz"; + name = "pkg_dir___pkg_dir_2.0.0.tgz"; path = fetchurl { - name = "pkg_dir___pkg_dir_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz"; - sha1 = "7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"; + name = "pkg_dir___pkg_dir_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz"; + sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; }; } { @@ -2802,11 +2842,11 @@ }; } { - name = "please_upgrade_node___please_upgrade_node_3.1.1.tgz"; + name = "please_upgrade_node___please_upgrade_node_3.2.0.tgz"; path = fetchurl { - name = "please_upgrade_node___please_upgrade_node_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz"; - sha1 = "ed320051dfcc5024fae696712c8288993595e8ac"; + name = "please_upgrade_node___please_upgrade_node_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz"; + sha1 = "aeddd3f994c933e4ad98b99d9a556efa0e2fe942"; }; } { @@ -2850,11 +2890,11 @@ }; } { - name = "prettier___prettier_1.15.3.tgz"; + name = "prettier___prettier_1.19.1.tgz"; path = fetchurl { - name = "prettier___prettier_1.15.3.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-1.15.3.tgz"; - sha1 = "1feaac5bdd181237b54dbe65d874e02a1472786a"; + name = "prettier___prettier_1.19.1.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz"; + sha1 = "f7d7f5ff8a9cd872a7be4ca142095956a60797cb"; }; } { @@ -2866,11 +2906,11 @@ }; } { - name = "process_nextick_args___process_nextick_args_2.0.0.tgz"; + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; path = fetchurl { - name = "process_nextick_args___process_nextick_args_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; - sha1 = "a37d732f4271b4ab1ad070d35508e8290788ffaa"; + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; }; } { @@ -2882,11 +2922,19 @@ }; } { - name = "prop_types___prop_types_15.6.2.tgz"; + name = "prop_types___prop_types_15.7.2.tgz"; path = fetchurl { - name = "prop_types___prop_types_15.6.2.tgz"; - url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz"; - sha1 = "05d5ca77b4453e985d60fc7ff8c859094a497102"; + name = "prop_types___prop_types_15.7.2.tgz"; + url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; + sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; + }; + } + { + name = "property_expr___property_expr_1.5.1.tgz"; + path = fetchurl { + name = "property_expr___property_expr_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/property-expr/-/property-expr-1.5.1.tgz"; + sha1 = "22e8706894a0c8e28d58735804f6ba3a3673314f"; }; } { @@ -2929,6 +2977,14 @@ sha1 = "8d41351eb8111c55353617fc3bbffad8e4d35d06"; }; } + { + name = "react_is___react_is_16.13.1.tgz"; + path = fetchurl { + name = "react_is___react_is_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; + sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; + }; + } { name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; path = fetchurl { @@ -2954,11 +3010,11 @@ }; } { - name = "readable_stream___readable_stream_2.3.6.tgz"; + name = "readable_stream___readable_stream_2.3.7.tgz"; path = fetchurl { - name = "readable_stream___readable_stream_2.3.6.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz"; - sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"; + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; }; } { @@ -2969,6 +3025,14 @@ sha1 = "be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"; }; } + { + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; + sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; + }; + } { name = "regex_not___regex_not_1.0.2.tgz"; path = fetchurl { @@ -2977,6 +3041,14 @@ sha1 = "1f4ece27e00b0b65e0247a6810e6a85d83a5752c"; }; } + { + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; + path = fetchurl { + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; + sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"; + }; + } { name = "regexpp___regexpp_1.1.0.tgz"; path = fetchurl { @@ -3082,11 +3154,11 @@ }; } { - name = "resolve___resolve_1.9.0.tgz"; + name = "resolve___resolve_1.17.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz"; - sha1 = "a14c6fdfa8f92a7df1d996cb7105fa744658ea06"; + name = "resolve___resolve_1.17.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz"; + sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444"; }; } { @@ -3114,11 +3186,19 @@ }; } { - name = "run_async___run_async_2.3.0.tgz"; + name = "rimraf___rimraf_2.7.1.tgz"; path = fetchurl { - name = "run_async___run_async_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz"; - sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + name = "rimraf___rimraf_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; + sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + }; + } + { + name = "run_async___run_async_2.4.1.tgz"; + path = fetchurl { + name = "run_async___run_async_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; + sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; }; } { @@ -3154,11 +3234,11 @@ }; } { - name = "rxjs___rxjs_6.3.3.tgz"; + name = "rxjs___rxjs_6.5.5.tgz"; path = fetchurl { - name = "rxjs___rxjs_6.3.3.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz"; - sha1 = "3c6a7fa420e844a81390fb1158a9ec614f4bad55"; + name = "rxjs___rxjs_6.5.5.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz"; + sha1 = "c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"; }; } { @@ -3194,11 +3274,11 @@ }; } { - name = "semver___semver_5.6.0.tgz"; + name = "semver___semver_5.7.1.tgz"; path = fetchurl { - name = "semver___semver_5.6.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz"; - sha1 = "7e74256fbaa49c75aa7c7a205cc22799cac80004"; + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; }; } { @@ -3218,19 +3298,11 @@ }; } { - name = "set_value___set_value_0.4.3.tgz"; + name = "set_value___set_value_2.0.1.tgz"; path = fetchurl { - name = "set_value___set_value_0.4.3.tgz"; - url = "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz"; - sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"; - }; - } - { - name = "set_value___set_value_2.0.0.tgz"; - path = fetchurl { - name = "set_value___set_value_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz"; - sha1 = "71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"; + name = "set_value___set_value_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"; + sha1 = "a18d40530e6f07de4228c7defe4227af8cad005b"; }; } { @@ -3250,19 +3322,27 @@ }; } { - name = "signal_exit___signal_exit_3.0.2.tgz"; + name = "side_channel___side_channel_1.0.2.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + name = "side_channel___side_channel_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz"; + sha1 = "df5d1abadb4e4bf4af1cd8852bf132d2f7876947"; }; } { - name = "simple_git___simple_git_1.107.0.tgz"; + name = "signal_exit___signal_exit_3.0.3.tgz"; path = fetchurl { - name = "simple_git___simple_git_1.107.0.tgz"; - url = "https://registry.yarnpkg.com/simple-git/-/simple-git-1.107.0.tgz"; - sha1 = "12cffaf261c14d6f450f7fdb86c21ccee968b383"; + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; + }; + } + { + name = "simple_git___simple_git_1.132.0.tgz"; + path = fetchurl { + name = "simple_git___simple_git_1.132.0.tgz"; + url = "https://registry.yarnpkg.com/simple-git/-/simple-git-1.132.0.tgz"; + sha1 = "53ac4c5ec9e74e37c2fd461e23309f22fcdf09b1"; }; } { @@ -3290,11 +3370,11 @@ }; } { - name = "slice_ansi___slice_ansi_2.0.0.tgz"; + name = "slice_ansi___slice_ansi_2.1.0.tgz"; path = fetchurl { - name = "slice_ansi___slice_ansi_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.0.0.tgz"; - sha1 = "5373bdb8559b45676e8541c66916cdd6251612e7"; + name = "slice_ansi___slice_ansi_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz"; + sha1 = "cacd7693461a637a5788d92a7dd4fba068e81636"; }; } { @@ -3322,11 +3402,11 @@ }; } { - name = "source_map_resolve___source_map_resolve_0.5.2.tgz"; + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; path = fetchurl { - name = "source_map_resolve___source_map_resolve_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; - sha1 = "72e2cc34095543e43b2c62b2c4c10d4a9054f259"; + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a"; }; } { @@ -3354,27 +3434,27 @@ }; } { - name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; path = fetchurl { - name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; - sha1 = "2ea450aee74f2a89bfb94519c07fcd6f41322977"; + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; }; } { - name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; path = fetchurl { - name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; - sha1 = "99e119b7a5da00e05491c9fa338b7904823b41d0"; + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; }; } { - name = "spdx_license_ids___spdx_license_ids_3.0.3.tgz"; + name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz"; - sha1 = "81c0ce8f21474756148bbb5f3bfc0f36bf15d76e"; + name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; + sha1 = "3694b5804567a458d3c8045842a6358632f62654"; }; } { @@ -3433,6 +3513,54 @@ sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; }; } + { + name = "string_width___string_width_3.1.0.tgz"; + path = fetchurl { + name = "string_width___string_width_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; + sha1 = "22767be21b62af1081574306f69ac51b62203961"; + }; + } + { + name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; + path = fetchurl { + name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz"; + sha1 = "48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"; + }; + } + { + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; + path = fetchurl { + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha1 = "85812a6b847ac002270f5808146064c995fb6913"; + }; + } + { + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.2.tgz"; + path = fetchurl { + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; + sha1 = "4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"; + }; + } + { + name = "string.prototype.trimright___string.prototype.trimright_2.1.2.tgz"; + path = fetchurl { + name = "string.prototype.trimright___string.prototype.trimright_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; + sha1 = "c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"; + }; + } + { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + path = fetchurl { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"; + }; + } { name = "string_decoder___string_decoder_1.1.1.tgz"; path = fetchurl { @@ -3466,11 +3594,11 @@ }; } { - name = "strip_ansi___strip_ansi_5.0.0.tgz"; + name = "strip_ansi___strip_ansi_5.2.0.tgz"; path = fetchurl { - name = "strip_ansi___strip_ansi_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz"; - sha1 = "f78f68b5d0866c20b2c9b8c61b5298508dc8756f"; + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; }; } { @@ -3537,6 +3665,14 @@ sha1 = "c22688aed4eab3cdc2dfeacbb561660560a00804"; }; } + { + name = "synchronous_promise___synchronous_promise_2.0.12.tgz"; + path = fetchurl { + name = "synchronous_promise___synchronous_promise_2.0.12.tgz"; + url = "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.12.tgz"; + sha1 = "219934f23c19c9aa716276cf2e1f8d4e5b04d07f"; + }; + } { name = "table___table_4.0.2.tgz"; path = fetchurl { @@ -3546,11 +3682,11 @@ }; } { - name = "table___table_5.1.1.tgz"; + name = "table___table_5.4.6.tgz"; path = fetchurl { - name = "table___table_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-5.1.1.tgz"; - sha1 = "92030192f1b7b51b6eeab23ed416862e47b70837"; + name = "table___table_5.4.6.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz"; + sha1 = "1292d19500ce3f86053b05f0e8e7e4a3bb21079e"; }; } { @@ -3610,19 +3746,19 @@ }; } { - name = "trim_right___trim_right_1.0.1.tgz"; + name = "toposort___toposort_2.0.2.tgz"; path = fetchurl { - name = "trim_right___trim_right_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz"; - sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; + name = "toposort___toposort_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz"; + sha1 = "ae21768175d1559d48bef35420b2f4962f09c330"; }; } { - name = "tslib___tslib_1.9.3.tgz"; + name = "tslib___tslib_1.13.0.tgz"; path = fetchurl { - name = "tslib___tslib_1.9.3.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz"; - sha1 = "d7e4dd79245d85428c4d7e4822a79917954ca286"; + name = "tslib___tslib_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz"; + sha1 = "c881e13cc7015894ed914862d276436fa9a47043"; }; } { @@ -3658,11 +3794,11 @@ }; } { - name = "union_value___union_value_1.0.0.tgz"; + name = "union_value___union_value_1.0.1.tgz"; path = fetchurl { - name = "union_value___union_value_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz"; - sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"; + name = "union_value___union_value_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz"; + sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847"; }; } { @@ -3738,11 +3874,11 @@ }; } { - name = "wordwrap___wordwrap_1.0.0.tgz"; + name = "word_wrap___word_wrap_1.2.3.tgz"; path = fetchurl { - name = "wordwrap___wordwrap_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; }; } { @@ -3769,6 +3905,14 @@ sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; } + { + name = "write___write_1.0.3.tgz"; + path = fetchurl { + name = "write___write_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz"; + sha1 = "0800e14523b923a387e415123c865616aae0f5c3"; + }; + } { name = "write___write_0.2.1.tgz"; path = fetchurl { @@ -3777,6 +3921,14 @@ sha1 = "5fc03828e264cea3fe91455476f7a3c566cb0757"; }; } + { + name = "xregexp___xregexp_4.3.0.tgz"; + path = fetchurl { + name = "xregexp___xregexp_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz"; + sha1 = "7e92e73d9174a99a59743f67a4ce879a04b5ae50"; + }; + } { name = "y18n___y18n_3.2.1.tgz"; path = fetchurl { @@ -3809,5 +3961,13 @@ sha1 = "6542debd9080ad517ec5048fb454efe9e4d4aaae"; }; } + { + name = "yup___yup_0.27.0.tgz"; + path = fetchurl { + name = "yup___yup_0.27.0.tgz"; + url = "https://registry.yarnpkg.com/yup/-/yup-0.27.0.tgz"; + sha1 = "f8cb198c8e7dd2124beddc2457571329096b06e7"; + }; + } ]; } From 23d75e6be0ea70a8882230ef05274c45fa7a5720 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 1 Jan 2021 17:33:04 +0100 Subject: [PATCH 002/101] yarn2nix: improve naming regexes Originally submitted in https://github.com/nix-community/yarn2nix/pull/128 --- .../tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js index bd48b84f22d..d3c7288a50a 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js @@ -22,8 +22,8 @@ function urlToName(url) { } return url - .replace('https://registry.yarnpkg.com/', '') // prevents having long directory names - .replace(/[@/:-]/g, '_') // replace @ and : and - characters with underscore + .replace(/https:\/\/(.)*(.com)\//g, '') // prevents having long directory names + .replace(/[@/%:-]/g, '_') // replace @ and : and - and % characters with underscore } module.exports = urlToName From 79723fcfb86ec858b9bc70ad8656ccf16b3121ed Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 1 Jan 2021 17:34:28 +0100 Subject: [PATCH 003/101] yarn2nix: remove deprecated yarn2nix fetch script --- .../tools/yarn2nix-moretea/fetch-source.nix | 10 ----- .../tools/yarn2nix-moretea/generate.sh | 40 ------------------- 2 files changed, 50 deletions(-) delete mode 100644 pkgs/development/tools/yarn2nix-moretea/fetch-source.nix delete mode 100755 pkgs/development/tools/yarn2nix-moretea/generate.sh diff --git a/pkgs/development/tools/yarn2nix-moretea/fetch-source.nix b/pkgs/development/tools/yarn2nix-moretea/fetch-source.nix deleted file mode 100644 index fc9b149887a..00000000000 --- a/pkgs/development/tools/yarn2nix-moretea/fetch-source.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs ? (import ../../../../. {}) -, fetchFromGitHub ? pkgs.fetchFromGitHub -}: - -fetchFromGitHub { - owner = "moretea"; - repo = "yarn2nix"; - rev = "9e7279edde2a4e0f5ec04c53f5cd64440a27a1ae"; - sha256 = "0zz2lrwn3y3rb8gzaiwxgz02dvy3s552zc70zvfqc0zh5dhydgn7"; -} diff --git a/pkgs/development/tools/yarn2nix-moretea/generate.sh b/pkgs/development/tools/yarn2nix-moretea/generate.sh deleted file mode 100755 index bfe1cda5e71..00000000000 --- a/pkgs/development/tools/yarn2nix-moretea/generate.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash - -### -### This script runs 'nix-build' with ./fetch-source.nix and copies a subset -### of the resulting store path into the current working directory. -### -### To disable running chmod, you may set the environment -### variable "FIX_RIGHTS" to "no". -### - -set -euo pipefail - -# 'nix-build' command -NIX_BUILD_BIN="${NIX_BUILD_BIN:-"/usr/bin/env nix-build"}" - -# where to place the yarn2nix source -TARGET_DIR="${TARGET_DIR:-"./yarn2nix"}" - -# whether to run 'chmod -R u=rwX,g=rX,o-rwx' on copied files in $TARGET_DIR -FIX_RIGHTS="${FIX_RIGHTS:-"yes"}" - -fetch_git_source() { - [[ -f ./fetch-source.nix ]] && ret="$($NIX_BUILD_BIN --no-out-link ./fetch-source.nix)" && ec="$?" || ec="$?" - if [[ "$ec" == "0" ]]; then - echo "$ret" - else - printf "error: failed at 'fetch_git_source()' with '%s'" "$ret" - fi -} - -result="$(fetch_git_source)" -if [[ "$result" == "/nix/store"* ]]; then - mkdir -p "$TARGET_DIR" - cp -Rv \ - "${result}/"{bin,internal,lib,nix,default.nix,package.json,yarn.nix,yarn.lock,LICENSE.txt} \ - "$TARGET_DIR" - [[ "$FIX_RIGHTS" = "yes" ]] \ - && chmod -v "u=rwX,g=rX,o-rwx" -R \ - "$TARGET_DIR/"{bin,internal,lib,nix,default.nix,package.json,yarn.nix,yarn.lock,LICENSE.txt} -fi From 169c6b4b1478a3a0c823c99ea39d4082f76a2708 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 22 Mar 2021 21:37:54 +0100 Subject: [PATCH 004/101] nixosTest: Make system.nixos.revision constant Make the revision metadata constant, in order to avoid needless retesting. The human version (e.g. 21.05-pre) is left as is, because it is useful for external modules that test with e.g. nixosTest and rely on that version number. --- nixos/lib/build-vms.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index ebbb0296bef..064e44f643b 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -36,6 +36,13 @@ rec { [ ../modules/virtualisation/qemu-vm.nix ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs { key = "no-manual"; documentation.nixos.enable = false; } + { key = "no-revision"; + # Make the revision metadata constant, in order to avoid needless retesting. + # The human version (e.g. 21.05-pre) is left as is, because it is useful + # for external modules that test with e.g. nixosTest and rely on that + # version number. + config.system.nixos.revision = "constant-nixos-revision"; + } { key = "nodes"; _module.args.nodes = nodes; } ] ++ optional minimal ../modules/testing/minimal-kernel.nix; }; From 8ee31be5dd60a3bd975e77511b0bdcfe54f18a82 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Fri, 14 May 2021 19:57:11 -0400 Subject: [PATCH 005/101] nixos/testing: add interactive serial stdout logs switch and dim them --- nixos/lib/test-driver/test-driver.py | 33 +++++++++++++++++++++++----- nixos/lib/testing-python.nix | 2 +- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 270a5969cda..6b868366e97 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -3,6 +3,7 @@ from contextlib import contextmanager, _GeneratorContextManager from queue import Queue, Empty from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List, Iterable from xml.sax.saxutils import XMLGenerator +from colorama import Style import queue import io import _thread @@ -151,6 +152,8 @@ class Logger: self.xml.startDocument() self.xml.startElement("logfile", attrs={}) + self._print_serial_logs = True + def close(self) -> None: self.xml.endElement("logfile") self.xml.endDocument() @@ -174,15 +177,21 @@ class Logger: self.drain_log_queue() self.log_line(message, attributes) - def enqueue(self, message: Dict[str, str]) -> None: - self.queue.put(message) + def log_serial(self, message: str, machine: str) -> None: + self.enqueue({"msg": message, "machine": machine, "type": "serial"}) + if self._print_serial_logs: + eprint(Style.DIM + "{} # {}".format(machine, message) + Style.RESET_ALL) + + def enqueue(self, item: Dict[str, str]) -> None: + self.queue.put(item) def drain_log_queue(self) -> None: try: while True: item = self.queue.get_nowait() - attributes = {"machine": item["machine"], "type": "serial"} - self.log_line(self.sanitise(item["msg"]), attributes) + msg = self.sanitise(item["msg"]) + del item["msg"] + self.log_line(msg, item) except Empty: pass @@ -327,6 +336,9 @@ class Machine: def log(self, msg: str) -> None: self.logger.log(msg, {"machine": self.name}) + def log_serial(self, msg: str) -> None: + self.logger.log_serial(msg, self.name) + def nested(self, msg: str, attrs: Dict[str, str] = {}) -> _GeneratorContextManager: my_attrs = {"machine": self.name} my_attrs.update(attrs) @@ -784,8 +796,7 @@ class Machine: # Ignore undecodable bytes that may occur in boot menus line = _line.decode(errors="ignore").replace("\r", "").rstrip() self.last_lines.put(line) - eprint("{} # {}".format(self.name, line)) - self.logger.enqueue({"msg": line, "machine": self.name}) + self.log_serial(line) _thread.start_new_thread(process_serial_output, ()) @@ -927,6 +938,16 @@ def run_tests() -> None: machine.execute("sync") +def serial_stdout_on() -> None: + global log + log._print_serial_logs = True + + +def serial_stdout_off() -> None: + global log + log._print_serial_logs = False + + @contextmanager def subtest(name: str) -> Iterator[None]: with log.nested(name): diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 7e87313e963..c9d4f0f0861 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -25,7 +25,7 @@ rec { name = "nixos-test-driver"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ (python3.withPackages (p: [ p.ptpython ])) ]; + buildInputs = [ (python3.withPackages (p: [ p.ptpython p.colorama ])) ]; checkInputs = with python3Packages; [ pylint black mypy ]; dontUnpack = true; From dcd149353db2d7b15da8ccfca3ecea665ebaa81e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 18 May 2021 04:20:00 +0000 Subject: [PATCH 006/101] postgresqlPackages.pgvector: 0.1.2 -> 0.1.4 --- pkgs/servers/sql/postgresql/ext/pgvector.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index a93c400069b..623bc8c42f8 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.1.2"; + version = "0.1.4"; src = fetchFromGitHub { owner = "ankane"; repo = pname; rev = "v${version}"; - sha256 = "1vq672ghhv0azpzgfb7azb36kbjyz9ypcly7r16lrryvjgp5lcjs"; + sha256 = "022f56rhvzq5f6clihxg5c8kyvjp1byjipha1ni6yiqzh3wvqccq"; }; buildInputs = [ postgresql ]; installPhase = '' install -D -t $out/lib vector.so - install -D -t $out/share/postgresql/extension vector-*.sql + install -D -t $out/share/postgresql/extension sql/vector-*.sql install -D -t $out/share/postgresql/extension vector.control ''; From 1c1e51ce318c491b27b02e03d4589ae9e300fb07 Mon Sep 17 00:00:00 2001 From: ren <546296+rencire@users.noreply.github.com> Date: Sat, 26 Dec 2020 19:59:35 -0800 Subject: [PATCH 007/101] linuxPackages.hid-nintendo: init at 3.1 --- .../linux/hid-nintendo/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/os-specific/linux/hid-nintendo/default.nix diff --git a/pkgs/os-specific/linux/hid-nintendo/default.nix b/pkgs/os-specific/linux/hid-nintendo/default.nix new file mode 100644 index 00000000000..321f96d0d36 --- /dev/null +++ b/pkgs/os-specific/linux/hid-nintendo/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + pname = "hid-nintendo"; + version = "3.1"; + + src = fetchFromGitHub { + owner = "nicman23"; + repo = "dkms-hid-nintendo"; + rev = version; + sha256 = "sha256-IanH3yHfkQhqtKvKD8lh+muc9yX8XJ5bfdy1Or8Vd5g="; + }; + + setSourceRoot = '' + export sourceRoot=$(pwd)/source/src + ''; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = [ + "-C" + "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "M=$(sourceRoot)" + ]; + + buildFlags = [ "modules" ]; + installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; + installTargets = [ "modules_install" ]; + + meta = with lib; { + description = "A Nintendo HID kernel module"; + homepage = "https://github.com/nicman23/dkms-hid-nintendo"; + license = licenses.gpl2; + maintainers = [ maintainers.rencire ]; + platforms = platforms.linux; + broken = versionOlder kernel.version "4.14"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 539751f9cc1..77c0fcf9935 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20374,6 +20374,8 @@ in gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { }; + hid-nintendo = callPackage ../os-specific/linux/hid-nintendo { }; + hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; e1000e = if lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; From 9e16b3b579017608d74ba68893697775598ba0e6 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Tue, 18 May 2021 09:42:58 +0200 Subject: [PATCH 008/101] renpy: ffmpeg_3 -> ffmpeg --- pkgs/development/interpreters/renpy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index ae5227fb198..b0c10c8a652 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, python2Packages, pkg-config, SDL2 -, libpng, ffmpeg_3, freetype, glew, libGL, libGLU, fribidi, zlib +, libpng, ffmpeg, freetype, glew, libGL, libGLU, fribidi, zlib , glib }: @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ python cython wrapPython tkinter - SDL2 libpng ffmpeg_3 freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib + SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib ]; pythonPath = [ pygame_sdl2 tkinter ]; RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [ - SDL2 SDL2.dev libpng ffmpeg_3 ffmpeg_3.out freetype glew.dev glew.out libGLU libGL fribidi zlib + SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU libGL fribidi zlib ]); buildPhase = '' From 9e4e445da658e3d2261b25c016360cff912a49ce Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Tue, 18 May 2021 09:47:42 +0200 Subject: [PATCH 009/101] devede: ffmpeg_3 -> ffmpeg --- pkgs/applications/video/devede/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index 6a4d0dc1b8d..e8fa11c9147 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitLab, python3Packages, ffmpeg_3, mplayer, vcdimager, cdrkit, dvdauthor +{ lib, fetchFromGitLab, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor , gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }: let @@ -30,11 +30,11 @@ in buildPythonApplication rec { ]; buildInputs = [ - ffmpeg_3 + ffmpeg ]; propagatedBuildInputs = [ - gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg_3 mplayer dvdauthor vcdimager cdrkit urllib3 setuptools + gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3 setuptools ]; postPatch = '' From 5afd15a2affe2229585109b1a5f039d604d30467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 11:10:39 +0200 Subject: [PATCH 010/101] opencl-clang: fix darwin build --- pkgs/development/libraries/opencl-clang/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index c40fb9c1203..48c681973d1 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -76,6 +76,13 @@ let ./opencl-headers-dir.patch ]; + # Uses linker flags that are not supported on Darwin. + postPatch = lib.optionalString stdenv.isDarwin '' + sed -i -e '/SET_LINUX_EXPORTS_FILE/d' CMakeLists.txt + substituteInPlace CMakeLists.txt \ + --replace '-Wl,--no-undefined' "" + ''; + nativeBuildInputs = [ cmake git llvm.dev ]; buildInputs = [ libclang llvm spirv-llvm-translator ]; From ec2c8dfc2bd06c9001d7a1144228e143031737b9 Mon Sep 17 00:00:00 2001 From: TheSola10 Date: Sat, 15 May 2021 12:43:58 +0200 Subject: [PATCH 011/101] dduper: init at v0.04 --- pkgs/tools/filesystems/dduper/default.nix | 50 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/tools/filesystems/dduper/default.nix diff --git a/pkgs/tools/filesystems/dduper/default.nix b/pkgs/tools/filesystems/dduper/default.nix new file mode 100644 index 00000000000..5d91e8d0dcc --- /dev/null +++ b/pkgs/tools/filesystems/dduper/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv, fetchpatch, fetchFromGitHub, btrfs-progs, python3 }: + +let + btrfsProgsPatched = btrfs-progs.overrideAttrs (oldAttrs: { + patches = [ + (fetchpatch { + name = "0001-Print-csum-for-a-given-file-on-stdout.patch"; + url = "https://raw.githubusercontent.com/Lakshmipathi/dduper/8fab08e0f1901bf54411d25f1767b48c978074cb/patch/btrfs-progs-v5.9/0001-Print-csum-for-a-given-file-on-stdout.patch"; + sha256 = "1li9lslrap70ibad8sij3bgpxn5lqs0j10l60bmy3c36y866q3g1"; + }) + ]; + }); + py3 = python3.withPackages (ps: with ps; [ + prettytable + numpy + ]); +in +stdenv.mkDerivation rec { + pname = "dduper"; + version = "0.04"; + + src = fetchFromGitHub { + owner = "lakshmipathi"; + repo = "dduper"; + rev = "v${version}"; + sha256 = "09ncdawxkffldadqhfblqlkdl05q2qmywxyg6p61fv3dr2f2v5wm"; + }; + + buildInputs = [ + btrfsProgsPatched + py3 + ]; + + patchPhase = '' + substituteInPlace ./dduper --replace "/usr/sbin/btrfs.static" "${btrfsProgsPatched}/bin/btrfs" + ''; + + installPhase = '' + mkdir -p $out/bin + install -m755 ./dduper $out/bin + ''; + + meta = with lib; { + description = "Fast block-level out-of-band BTRFS deduplication tool."; + homepage = "https://github.com/Lakshmipathi/dduper"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ thesola10 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11d313fc0ed..9b7af2c4214 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2288,6 +2288,8 @@ in ddate = callPackage ../tools/misc/ddate { }; + dduper = callPackage ../tools/filesystems/dduper { }; + dedup = callPackage ../tools/backup/dedup { }; dehydrated = callPackage ../tools/admin/dehydrated { }; From 1a1ae37287ea168202a4c71c83eb7373837fe7ff Mon Sep 17 00:00:00 2001 From: "J. Neto" Date: Tue, 18 May 2021 02:49:44 -0300 Subject: [PATCH 012/101] pythonPackages.vdirsyncer: fix build with python 3.9 --- pkgs/development/python-modules/vdirsyncer/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 1f7642bfe34..01ab42ed9c3 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , isPy27 , click , click-log @@ -45,6 +46,14 @@ buildPythonPackage rec { pytest-subtesthack ]; + patches = [ + (fetchpatch { + name = "update-usage-deprecated-method.patch"; + url = "https://github.com/pimutils/vdirsyncer/commit/7577fa21177442aacc2d86640ef28cebf1c4aaef.patch"; + sha256 = "0inkr1wfal20kssij8l5myhpjivxg8wlvhppqc3lvml9d1i75qbh"; + }) + ]; + postPatch = '' substituteInPlace setup.py --replace "click>=5.0,<6.0" "click" ''; From 8c5fd78d0b929c2283f3db1ee2c9914b46462840 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 18 May 2021 16:14:57 -0400 Subject: [PATCH 013/101] bibutils: support static builds --- pkgs/tools/misc/bibutils/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index cf42e56b571..1415faadef8 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, static ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "bibutils"; @@ -9,7 +13,11 @@ stdenv.mkDerivation rec { sha256 = "15p4av74ihsg03j854dkdqihpspwnp58p9g1lhx48w8kz91c0ml6"; }; - configureFlags = [ "--dynamic" "--install-dir" "$(out)/bin" "--install-lib" "$(out)/lib" ]; + configureFlags = [ + (if static then "--static" else "--dynamic") + "--install-dir" "$(out)/bin" + "--install-lib" "$(out)/lib" + ]; dontAddPrefix = true; doCheck = true; From b75ce20dfa4aac349c9ff7d8e1f7a4d09aeab96a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 18 May 2021 16:15:29 -0400 Subject: [PATCH 014/101] bibutils: enable on darwin --- pkgs/tools/misc/bibutils/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index 1415faadef8..03b35811bc5 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { sha256 = "15p4av74ihsg03j854dkdqihpspwnp58p9g1lhx48w8kz91c0ml6"; }; + preConfigure = lib.optionalString stdenv.isDarwin '' + substituteInPlace lib/Makefile.dynamic \ + --replace '-Wl,-soname,$(SONAME)' "" + ''; + configureFlags = [ (if static then "--static" else "--dynamic") "--install-dir" "$(out)/bin" @@ -22,6 +27,9 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; + preCheck = lib.optionalString stdenv.isDarwin '' + export DYLD_LIBRARY_PATH=`pwd`/lib + ''; meta = with lib; { description = "Bibliography format interconversion"; @@ -29,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/p/bibutils/home/Bibutils/"; license = licenses.gpl2; maintainers = [ maintainers.garrison ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From ac582ccd61dc6b5b2aaa107c6867fa6c39b3c77b Mon Sep 17 00:00:00 2001 From: Tobias Stenzel Date: Mon, 17 May 2021 23:12:29 +0200 Subject: [PATCH 015/101] grafana: 7.5.2 -> 7.5.6 Changelog: * https://github.com/grafana/grafana/releases/tag/v7.5.3 * https://github.com/grafana/grafana/releases/tag/v7.5.4 * https://github.com/grafana/grafana/releases/tag/v7.5.5 * https://github.com/grafana/grafana/releases/tag/v7.5.6 --- pkgs/servers/monitoring/grafana/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 364d2e44353..4c3246754fb 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.5.2"; + version = "7.5.6"; excludedPackages = [ "release_publisher" ]; @@ -10,17 +10,24 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-8Qy5YgJZpvaAjeBAi092Jxg4yAD1fYmMteTRm5b0Q+g="; + sha256 = "1683as90p4zkzhaj52vy60bcmpr77zynys87mjzh3s6ks3xfxn2x"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-yVswMNOLX/AFtv45TXm8WcHEytyYgtjvi7V0dRewDdc="; + sha256 = "1mywvm4d116y56rffiywk1hx6wxj1418gf7q0v0hfdlwk1lqi9nz"; }; - vendorSha256 = "sha256-oh3GB6Iaqy05IS2MU5LJqTXnlr0vtkACZA6wpmW7W2Q="; + vendorSha256 = "01a5v292x59fmayjkqnf4c8k8viasxr2s2khs4yrv6p829lx3hq2"; + # grafana-aws-sdk is specified with two versions which causes a problem later: + # go: inconsistent vendoring in /build/source: + # github.com/grafana/grafana-aws-sdk@v0.3.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt + # Remove the older one here to fix this. postPatch = '' + substituteInPlace go.mod \ + --replace 'github.com/grafana/grafana-aws-sdk v0.3.0' "" + substituteInPlace pkg/cmd/grafana-server/main.go \ --replace 'var version = "5.0.0"' 'var version = "${version}"' ''; From 6be9a81363303d0895cbf4496d331628f76d9fd5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 May 2021 03:09:19 +0200 Subject: [PATCH 016/101] esphome: 1.17.2 -> 1.18.0 --- pkgs/tools/misc/esphome/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 77273f8fd2f..fe02fe0d521 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "1.17.2"; + version = "1.18.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1md52xzlrzf99s5q2152s1b7yql2h02ss451g68ky207xz660aj1"; + sha256 = "1vz3d59wfqssfv1kvd4minlxibr0id06xfyg8956w9s3b22jc5vq"; }; postPatch = '' @@ -67,6 +67,7 @@ python3.pkgs.buildPythonApplication rec { hypothesis mock pytest-mock + pytest-sugar pytestCheckHook ]; From bd02b3a56808889d268b5cebc146f6dcbdf6a007 Mon Sep 17 00:00:00 2001 From: Elias Probst Date: Sun, 16 May 2021 22:32:18 +0200 Subject: [PATCH 017/101] plasma-sdk: init at 5.21.4 --- pkgs/desktops/plasma-5/default.nix | 1 + pkgs/desktops/plasma-5/plasma-sdk.nix | 41 +++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/desktops/plasma-5/plasma-sdk.nix diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index ea2e199e931..4b41e5ad9d5 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -139,6 +139,7 @@ let plasma-integration = callPackage ./plasma-integration {}; plasma-nm = callPackage ./plasma-nm {}; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; + plasma-sdk = callPackage ./plasma-sdk.nix {}; plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { }; plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { }; plasma-vault = callPackage ./plasma-vault {}; diff --git a/pkgs/desktops/plasma-5/plasma-sdk.nix b/pkgs/desktops/plasma-5/plasma-sdk.nix new file mode 100644 index 00000000000..e82fc4d0602 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-sdk.nix @@ -0,0 +1,41 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, karchive +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdeclarative +, ki18n +, kiconthemes +, kio +, plasma-framework +, kservice +, ktexteditor +, kwidgetsaddons +, kdoctools +, qtbase +}: + +mkDerivation { + name = "plasma-sdk"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + karchive + kcompletion + kconfig + kconfigwidgets + kcoreaddons + kdbusaddons + kdeclarative + ki18n + kiconthemes + kio + plasma-framework + kservice + ktexteditor + kwidgetsaddons + ]; +} From 3e8eec9329c4aea491fac06b23db001a3cd19f84 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 19 May 2021 04:20:00 +0000 Subject: [PATCH 018/101] nodejs-14_x: 14.16.1 -> 14.17.0 https://github.com/nodejs/node/releases/tag/v14.17.0 --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 535bfab7123..7054e4c66b8 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.16.1"; - sha256 = "1hxsk83g2plv6vv3ir1ngca0rwqdy3lq70r504d2qv3msszdnjp4"; + version = "14.17.0"; + sha256 = "1vf989canwcx0wdpngvkbz2x232yccp7fzs1vcbr60rijgzmpq2n"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From 7b4478eb4a8e6560c784ea3a5296b643468f8401 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 19 May 2021 04:20:00 +0000 Subject: [PATCH 019/101] nodejs-16_x: 16.1.0 -> 16.2.0 https://github.com/nodejs/node/releases/tag/v16.2.0 --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 2d7fd5df921..dec02ad22f5 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.1.0"; - sha256 = "0z0808mw674mshgbmhgngqfkrdix3b61f77xcdz7bwf1j87j7ad0"; + version = "16.2.0"; + sha256 = "1krm3cnpbnqg4mfl3cpp8x2i1rr6hba9qbl60wyg5f5g8ac3pyfh"; } From 1a1beb12165994e5694c63fdeab1ddc346225af5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 19 May 2021 04:20:00 +0000 Subject: [PATCH 020/101] nodejs-15_x: drop Node.js 15 is going to reach EOL on June 1, 2021. --- pkgs/top-level/all-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 725056d4140..70765f80a14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6317,10 +6317,6 @@ in nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix { enableNpm = false; }; - nodejs-15_x = callPackage ../development/web/nodejs/v15.nix { }; - nodejs-slim-15_x = callPackage ../development/web/nodejs/v15.nix { - enableNpm = false; - }; nodejs-16_x = callPackage ../development/web/nodejs/v16.nix { }; nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix { enableNpm = false; From 68cfba1ac6985faa78c362adf78dec240ae692ee Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 19 May 2021 02:25:16 -0400 Subject: [PATCH 021/101] libAfterImage: unvendor dependencies --- .../libraries/libAfterImage/default.nix | 47 ++++++++++++++++++- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix index 1c88459ba9b..e43999a5ca9 100644 --- a/pkgs/development/libraries/libAfterImage/default.nix +++ b/pkgs/development/libraries/libAfterImage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, giflib, libjpeg, libpng, zlib }: stdenv.mkDerivation { pname = "libAfterImage"; @@ -13,7 +13,50 @@ stdenv.mkDerivation { sha256 = "0n74rxidwig3yhr6fzxsk7y19n1nq1f296lzrvgj5pfiyi9k48vf"; }; - buildInputs = [ zlib ]; + patches = [ + # add back --with-gif option + (fetchpatch { + name = "libafterimage-gif.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-gif.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; + sha256 = "16pa94wlqpd7h6mzs4f0qm794yk1xczrwsgf93kdd3g0zbjq3rnr"; + }) + + # fix build with newer giflib + (fetchpatch { + name = "libafterimage-giflib5-v2.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-giflib5-v2.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; + sha256 = "0qwydqy9bm73cg5n3vm97aj4jfi70p7fxqmfbi54vi78z593brln"; + stripLen = 1; + }) + + # fix build with newer libpng + (fetchpatch { + name = "libafterimage-libpng15.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-libpng15.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; + sha256 = "1qyvf7786hayasfnnilfbri3p99cfz5wjpbli3gdqj2cvk6mpydv"; + }) + + # fix an ldconfig problem + (fetchpatch { + name = "libafterimage-makefile.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-makefile.in.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; + sha256 = "1n6fniz6dldms615046yhc4mlg9gb53y4yfia8wfz6szgq5zicj4"; + }) + ]; + patchFlags = [ "-p0" ]; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ giflib libjpeg libpng zlib ]; + + preConfigure = '' + rm -rf {libjpeg,libpng,libungif,zlib}/ + substituteInPlace Makefile.in \ + --replace "include .depend" "" + ''; + + configureFlags = [ + "--with-gif" + ]; meta = with lib; { homepage = "http://www.afterstep.org/afterimage/"; From 3ec06bc2eb274c752923fbed4471f02b686ba629 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 19 May 2021 02:25:32 -0400 Subject: [PATCH 022/101] libAfterImage: don't use weird mmx flags --- pkgs/development/libraries/libAfterImage/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix index e43999a5ca9..6096c6a67b7 100644 --- a/pkgs/development/libraries/libAfterImage/default.nix +++ b/pkgs/development/libraries/libAfterImage/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-gif" + "--disable-mmx-optimization" ]; meta = with lib; { From d7692cd0d12e012fecde8c8c5771d4b07b408b78 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 19 May 2021 14:50:13 +0800 Subject: [PATCH 023/101] linuxPackages.rtl8821cu: switch to a more maintained fork --- pkgs/os-specific/linux/rtl8821cu/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 20bb590895b..556fd793915 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc }: + stdenv.mkDerivation rec { - name = "rtl8821cu-${kernel.version}-${version}"; - version = "unstable-2020-12-21"; + pname = "rtl8821cu"; + version = "${kernel.version}-unstable-2021-05-19"; src = fetchFromGitHub { - owner = "brektrou"; - repo = "rtl8821cu"; - rev = "428a0820487418ec69c0edb91726d1cf19763b1e"; - sha256 = "1ccl94727yq7gzn37ky91k0736cambgnkaa37r2f2hinpl9qdd8q"; + owner = "morrownr"; + repo = "8821cu"; + rev = "2430c354c9b15fa6193a263c99ce57211d50c66f"; + sha256 = "sha256-PkrpwebZYh/hBukqDQf6pxfbkVyA+CpYtte5pmzgLtw="; }; hardeningDisable = [ "pic" ]; @@ -29,8 +30,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Realtek rtl8821cu driver"; - homepage = "https://github.com/brektrou/rtl8821CU"; - license = licenses.gpl2; + homepage = "https://github.com/morrownr/8821cu"; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.contrun ]; }; From f99ff01e70b1fb53fd3bb051190a052c7a188e78 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 19 May 2021 12:31:17 +0200 Subject: [PATCH 024/101] octant: enable aarch64-darwin build --- pkgs/applications/networking/cluster/octant/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index ff86b64fec7..d032577ce19 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { x86_64-linux = "Linux-64bit"; aarch64-linux = "Linux-arm64"; x86_64-darwin = "macOS-64bit"; + aarch64-darwin = "macOS-arm64"; }.${system} or (throw "Unsupported system: ${system}"); fetchsrc = version: sha256: fetchzip { url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/octant_${version}_${suffix}.tar.gz"; @@ -21,6 +22,7 @@ stdenv.mkDerivation rec { x86_64-linux = "sha256-VFlZP5d6/YhzVIhveqMc4HfapBt0K/XjtqjCQNc514A="; aarch64-linux = "sha256-RfdMfimmoHG4ixBtUVJ/V+mDhQ9aD+yeohkeUMUP8Zg="; x86_64-darwin = "sha256-2Qgl3RdA4mMRTqR7o3Q86Zip5wtgvFp1vZn689FUtSI="; + aarch64-darwin = "sha256-+eZVg+B5YYf+XnDhNd6OU4+yFM9GtyiavcAr/EXh7XE="; }; dontConfigure = true; @@ -59,6 +61,6 @@ stdenv.mkDerivation rec { ''; license = licenses.asl20; maintainers = with maintainers; [ jk ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } From 9fcdd5557a8f80c0339138195ff3b4e3416ff2b8 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 19 May 2021 12:48:59 +0200 Subject: [PATCH 025/101] electron: enable aarch64-darwin build (for electron 11+) --- pkgs/development/tools/electron/default.nix | 2 ++ pkgs/development/tools/electron/generic.nix | 4 +++- pkgs/development/tools/electron/print-hashes.sh | 7 +++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index d5007989bcb..5ecec0059a0 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -101,6 +101,7 @@ rec { i686-linux = "b76e69ad4b654384b4f1647f0cb362e78c1d99be7b814d7d32abc22294639ace"; armv7l-linux = "cc4be8e0c348bc8db5002cf6c63c1d02fcb594f1f8bfc358168738c930098857"; aarch64-linux = "75665dd5b2b9938bb4572344d459db65f46c5f7c637a32946c5a822cc23a77dc"; + aarch64-darwin = "0c782b1d4eb848bae780f4e3a236caa1671486264c1f8e72fde98f1256d8f9e5"; headers = "0ip1wxgflifs86vk4xpz1555xa7yjy64ygqgd5a2g723148m52rk"; }; @@ -110,6 +111,7 @@ rec { i686-linux = "16023d86b88c7fccafd491c020d064caa2138d6a3493664739714555f72e5b06"; armv7l-linux = "53cc1250ff62f2353d8dd37552cbd7bdcaaa756106faee8b809303bed00e040a"; aarch64-linux = "3eddc0c507a43cce4e714bfe509d99218b5ab99f4660dd173aac2a895576dc71"; + aarch64-darwin = "2bc8f37af68e220f93fb9abc62d1c56d8b64baaf0ef9ef974f24ddcbe4f8b488"; headers = "1ji9aj7qr4b27m5kprsgsrl21rjphz5bbnmn6q0n2x84l429nyfb"; }; } diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 7d4593dee3c..def103f6e56 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -26,7 +26,8 @@ let homepage = "https://github.com/electron/electron"; license = licenses.mit; maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; - platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ] + ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ]; knownVulnerabilities = optional (versionOlder version "6.0.0") "Electron version ${version} is EOL"; }; @@ -46,6 +47,7 @@ let armv7l-linux = "linux-armv7l"; aarch64-linux = "linux-arm64"; x86_64-darwin = "darwin-x64"; + aarch64-darwin = "darwin-arm64"; }; get = as: platform: as.${platform.system} or diff --git a/pkgs/development/tools/electron/print-hashes.sh b/pkgs/development/tools/electron/print-hashes.sh index d6c5d94ec41..48c8f0412e1 100755 --- a/pkgs/development/tools/electron/print-hashes.sh +++ b/pkgs/development/tools/electron/print-hashes.sh @@ -17,6 +17,7 @@ SYSTEMS=( [armv7l-linux]=linux-armv7l [aarch64-linux]=linux-arm64 [x86_64-darwin]=darwin-x64 + [aarch64-darwin]=darwin-arm64 ) hashfile="$(nix-prefetch-url --print-path "https://github.com/electron/electron/releases/download/v${VERSION}/SHASUMS256.txt" 2>/dev/null | tail -n1)" @@ -27,8 +28,10 @@ headers="$(nix-prefetch-url "https://atom.io/download/electron/v${VERSION}/node- echo " electron_${VERSION%%.*} = mkElectron \"${VERSION}\" {" for S in "${!SYSTEMS[@]}"; do - hash="$(grep " *electron-v${VERSION}-${SYSTEMS[$S]}.zip$" "$hashfile"|cut -f1 -d' ')" - echo " $S = \"$hash\";" + hash="$(grep " *electron-v${VERSION}-${SYSTEMS[$S]}.zip$" "$hashfile"|cut -f1 -d' ' || :)" + if [[ -n $hash ]]; then + echo " $S = \"$hash\";" + fi done echo " headers = \"$headers\";" From de89bddf7eb90216541380c05f717a17dbc5e314 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 May 2021 13:06:00 +0200 Subject: [PATCH 026/101] prometheus: 2.26.0 -> 2.27.1 Fixes an open redirect vulnerability on the /new endpoint. https://github.com/prometheus/prometheus/security/advisories/GHSA-vx57-7f4q-fpc7 https://github.com/prometheus/prometheus/releases/tag/v2.27.1 https://github.com/prometheus/prometheus/releases/tag/v2.27.0 Fixes: CVE-2021-29622 --- .../servers/monitoring/prometheus/default.nix | 6 +- .../monitoring/prometheus/webui-package.json | 34 +- .../monitoring/prometheus/webui-yarndeps.nix | 1024 +++++++++-------- 3 files changed, 573 insertions(+), 491 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 49a5d420cbd..b87817af439 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -3,13 +3,13 @@ }: let - version = "2.26.0"; + version = "2.27.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "06zr10zx3f526wcxj77smcl8wk55mhlnikd0b8vbjl9yyb0qc5mz"; + sha256 = "0836ygyvld5skjycd7366i6vyf451s6cay5ng6c2fwq0skvp2gj2"; }; goPackagePath = "github.com/prometheus/prometheus"; @@ -31,7 +31,7 @@ in buildGoModule rec { pname = "prometheus"; inherit src version; - vendorSha256 = "0h14pmk74lxj7z39jb4xwvx3whwkaxn9686y23sgrpkra5sk6dbm"; + vendorSha256 = "0dq3p7hga7m1aq78har5rr136hlb0kp8zhh2wzqlkxrk1f33w54p"; excludedPackages = [ "documentation/prometheus-mixin" ]; diff --git a/pkgs/servers/monitoring/prometheus/webui-package.json b/pkgs/servers/monitoring/prometheus/webui-package.json index 15e2dcb519e..d46aeaa5dca 100644 --- a/pkgs/servers/monitoring/prometheus/webui-package.json +++ b/pkgs/servers/monitoring/prometheus/webui-package.json @@ -15,27 +15,18 @@ "@codemirror/search": "^0.18.2", "@codemirror/state": "^0.18.2", "@codemirror/view": "^0.18.3", + "@forevolve/bootstrap-dark": "^1.0.0", "@fortawesome/fontawesome-svg-core": "^1.2.14", "@fortawesome/free-solid-svg-icons": "^5.7.1", "@fortawesome/react-fontawesome": "^0.1.4", "@reach/router": "^1.2.1", - "@types/jest": "^26.0.10", - "@types/jquery": "^3.5.1", - "@types/node": "^12.11.1", - "@types/reach__router": "^1.2.6", - "@types/react": "^16.8.2", - "@types/react-copy-to-clipboard": "^5.0.0", - "@types/react-dom": "^16.8.0", - "@types/react-resize-detector": "^5.0.0", - "@types/sanitize-html": "^1.20.2", - "bootstrap": "^4.2.1", - "codemirror-promql": "^0.14.0", + "bootstrap": "^4.6.0", + "codemirror-promql": "^0.15.0", "css.escape": "^1.5.1", "downshift": "^3.4.8", "enzyme-to-json": "^3.4.3", "fuzzy": "^0.1.3", "i": "^0.3.6", - "jest-fetch-mock": "^3.0.3", "jquery": "^3.5.1", "jquery.flot.tooltip": "^0.9.0", "jsdom": "^16.4.0", @@ -48,11 +39,13 @@ "react-resize-detector": "^5.0.7", "react-scripts": "3.4.4", "react-test-renderer": "^16.9.0", - "reactstrap": "^8.0.1", - "sanitize-html": "^1.20.1", + "reactstrap": "^8.9.0", + "sanitize-html": "^2.3.3", + "sass": "1.32.10", "tempusdominus-bootstrap-4": "^5.1.2", "tempusdominus-core": "^5.0.3", - "typescript": "^3.3.3" + "typescript": "^3.3.3", + "use-media": "^1.4.0" }, "scripts": { "start": "react-scripts start", @@ -79,8 +72,17 @@ "@types/enzyme": "^3.10.3", "@types/enzyme-adapter-react-16": "^1.0.5", "@types/flot": "0.0.31", + "@types/jest": "^26.0.10", + "@types/jquery": "^3.5.1", "@types/moment-timezone": "^0.5.10", - "@types/reactstrap": "^8.0.5", + "@types/node": "^12.11.1", + "@types/reach__router": "^1.2.6", + "@types/react": "^16.8.2", + "@types/react-copy-to-clipboard": "^5.0.0", + "@types/react-dom": "^16.8.0", + "@types/react-resize-detector": "^5.0.0", + "@types/reactstrap": "^8.7.2", + "@types/sanitize-html": "^1.20.2", "@types/sinon": "^9.0.4", "@typescript-eslint/eslint-plugin": "2.x", "@typescript-eslint/parser": "2.x", diff --git a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix index 4b26fca7276..496d2fff4ae 100644 --- a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix +++ b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix @@ -18,11 +18,11 @@ }; } { - name = "_babel_compat_data___compat_data_7.13.12.tgz"; + name = "_babel_compat_data___compat_data_7.14.0.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.12.tgz"; - sha1 = "a8a5ccac19c200f9dd49624cac6e19d7be1236a1"; + name = "_babel_compat_data___compat_data_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz"; + sha1 = "a901128bce2ad02565df95e6ecbf195cf9465919"; }; } { @@ -34,19 +34,19 @@ }; } { - name = "_babel_core___core_7.13.10.tgz"; + name = "_babel_core___core_7.14.0.tgz"; path = fetchurl { - name = "_babel_core___core_7.13.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.13.10.tgz"; - sha1 = "07de050bbd8193fcd8a3c27918c0890613a94559"; + name = "_babel_core___core_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.0.tgz"; + sha1 = "47299ff3ec8d111b493f1a9d04bf88c04e728d88"; }; } { - name = "_babel_generator___generator_7.13.9.tgz"; + name = "_babel_generator___generator_7.14.1.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.13.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz"; - sha1 = "3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"; + name = "_babel_generator___generator_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.1.tgz"; + sha1 = "1f99331babd65700183628da186f36f63d615c93"; }; } { @@ -66,19 +66,19 @@ }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.10.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.10.tgz"; - sha1 = "1310a1678cb8427c07a753750da4f8ce442bdd0c"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.13.16.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz"; + sha1 = "6e91dccf15e3f43e5556dffe32d860109887563c"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.13.11.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.1.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.13.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz"; - sha1 = "30d30a005bca2c953f5653fc25091a492177f4f6"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.1.tgz"; + sha1 = "1fe11b376f3c41650ad9fedc665b0068722ea76c"; }; } { @@ -90,11 +90,11 @@ }; } { - name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.1.5.tgz"; + name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.2.0.tgz"; path = fetchurl { - name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz"; - sha1 = "3c2f91b7971b9fc11fe779c945c014065dea340e"; + name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz"; + sha1 = "a640051772045fedaaecc6f0c6c69f02bdd34bf1"; }; } { @@ -122,11 +122,11 @@ }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.13.0.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.13.16.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz"; - sha1 = "5d5882e855b5c5eda91e0cadc26c6e7a2c8593d8"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.13.16.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz"; + sha1 = "1b1651249e94b51f8f0d33439843e33e39775b30"; }; } { @@ -146,11 +146,11 @@ }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.13.12.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.14.0.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.12.tgz"; - sha1 = "600e58350490828d82282631a1422268e982ba96"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz"; + sha1 = "8fcf78be220156f22633ee204ea81f73f826a8ad"; }; } { @@ -210,11 +210,11 @@ }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; - sha1 = "c9a1f021917dcb5ccf0d4e453e399022981fc9ed"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz"; + sha1 = "d26cad8a47c65286b15df1547319a5d0bcf27288"; }; } { @@ -234,27 +234,27 @@ }; } { - name = "_babel_helpers___helpers_7.13.10.tgz"; + name = "_babel_helpers___helpers_7.14.0.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.13.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz"; - sha1 = "fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8"; + name = "_babel_helpers___helpers_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz"; + sha1 = "ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"; }; } { - name = "_babel_highlight___highlight_7.13.10.tgz"; + name = "_babel_highlight___highlight_7.14.0.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.13.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz"; - sha1 = "a8b2a66148f5b27d666b15d81774347a731d52d1"; + name = "_babel_highlight___highlight_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz"; + sha1 = "3197e375711ef6bf834e67d0daec88e4f46113cf"; }; } { - name = "_babel_parser___parser_7.13.12.tgz"; + name = "_babel_parser___parser_7.14.1.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.12.tgz"; - sha1 = "ba320059420774394d3b0c0233ba40e4250b81d1"; + name = "_babel_parser___parser_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.1.tgz"; + sha1 = "1bd644b5db3f5797c4479d89ec1817fe02b84c47"; }; } { @@ -266,11 +266,11 @@ }; } { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.13.8.tgz"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.13.15.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz"; - sha1 = "87aacb574b3bc4b5603f6fe41458d72a5a2ec4b1"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.13.15.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz"; + sha1 = "80e549df273a3b3050431b148c892491df1bcc5b"; }; } { @@ -289,6 +289,14 @@ sha1 = "146376000b94efd001e57a40a88a525afaab9f37"; }; } + { + name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.13.11.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.13.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.13.11.tgz"; + sha1 = "6fcbba4a962702c17e5371a0c7b39afde186d703"; + }; + } { name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.8.3.tgz"; path = fetchurl { @@ -401,6 +409,14 @@ sha1 = "04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787"; }; } + { + name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.14.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz"; + sha1 = "b1a1f2030586b9d3489cc26179d2eb5883277636"; + }; + } { name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.13.tgz"; path = fetchurl { @@ -425,6 +441,14 @@ sha1 = "b5c987274c4a3a82b89714796931a6b53544ae10"; }; } + { + name = "_babel_plugin_syntax_class_static_block___plugin_syntax_class_static_block_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_class_static_block___plugin_syntax_class_static_block_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.12.13.tgz"; + sha1 = "8e3d674b0613e67975ceac2776c97b60cafc5c9c"; + }; + } { name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.13.tgz"; path = fetchurl { @@ -521,6 +545,14 @@ sha1 = "4f69c2ab95167e0180cd5336613f8c5788f7d48a"; }; } + { + name = "_babel_plugin_syntax_private_property_in_object___plugin_syntax_private_property_in_object_7.14.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_private_property_in_object___plugin_syntax_private_property_in_object_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.0.tgz"; + sha1 = "762a4babec61176fec6c88480dec40372b140c0b"; + }; + } { name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; path = fetchurl { @@ -562,11 +594,11 @@ }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.12.13.tgz"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz"; - sha1 = "f36e55076d06f41dfd78557ea039c1b581642e61"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.1.tgz"; + sha1 = "ac1b3a8e3d8cbb31efc6b9be2f74eb9823b74ab2"; }; } { @@ -586,11 +618,11 @@ }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.0.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.17.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz"; - sha1 = "c5dce270014d4e1ebb1d806116694c12b7028963"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.13.17.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz"; + sha1 = "678d96576638c19d5b36b332504d3fd6e06dea27"; }; } { @@ -658,19 +690,19 @@ }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.13.0.tgz"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz"; - sha1 = "19f511d60e3d8753cc5a6d4e775d3a5184866cc3"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.0.tgz"; + sha1 = "589494b5b290ff76cf7f59c798011f6d77026553"; }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.13.8.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.14.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz"; - sha1 = "7b01ad7c2dcf2275b06fa1781e00d13d420b3e1b"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz"; + sha1 = "52bc199cb581e0992edba0f0f80356467587f161"; }; } { @@ -682,11 +714,11 @@ }; } { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.13.0.tgz"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.14.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz"; - sha1 = "8a3d96a97d199705b9fd021580082af81c06e70b"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz"; + sha1 = "2f8179d1bbc9263665ce4a65f305526b2ea8ac34"; }; } { @@ -730,11 +762,11 @@ }; } { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.13.10.tgz"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.13.13.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.13.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.13.10.tgz"; - sha1 = "5d3de8a8ee53f4612e728f4f17b8c9125f8019e5"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.13.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.13.13.tgz"; + sha1 = "0208b1d942bf939cd4f7aa5b255d42602aa4a920"; }; } { @@ -794,11 +826,11 @@ }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.12.13.tgz"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.13.15.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz"; - sha1 = "b628bcc9c85260ac1aeb05b45bde25210194a2f5"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.13.15.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz"; + sha1 = "e5eb28945bf8b6563e7f818945f966a8d2997f39"; }; } { @@ -890,11 +922,11 @@ }; } { - name = "_babel_preset_env___preset_env_7.13.12.tgz"; + name = "_babel_preset_env___preset_env_7.14.1.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.12.tgz"; - sha1 = "6dff470478290582ac282fb77780eadf32480237"; + name = "_babel_preset_env___preset_env_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.1.tgz"; + sha1 = "b55914e2e68885ea03f69600b2d3537e54574a93"; }; } { @@ -914,11 +946,11 @@ }; } { - name = "_babel_preset_react___preset_react_7.12.13.tgz"; + name = "_babel_preset_react___preset_react_7.13.13.tgz"; path = fetchurl { - name = "_babel_preset_react___preset_react_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.13.tgz"; - sha1 = "5f911b2eb24277fa686820d5bd81cad9a0602a0a"; + name = "_babel_preset_react___preset_react_7.13.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.13.13.tgz"; + sha1 = "fa6895a96c50763fe693f9148568458d5a839761"; }; } { @@ -930,11 +962,11 @@ }; } { - name = "_babel_runtime_corejs3___runtime_corejs3_7.13.10.tgz"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.14.0.tgz"; path = fetchurl { - name = "_babel_runtime_corejs3___runtime_corejs3_7.13.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.13.10.tgz"; - sha1 = "14c3f4c85de22ba88e8e86685d13e8861a82fe86"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.14.0.tgz"; + sha1 = "6bf5fbc0b961f8e3202888cb2cd0fb7a0a9a3f66"; }; } { @@ -946,11 +978,11 @@ }; } { - name = "_babel_runtime___runtime_7.13.10.tgz"; + name = "_babel_runtime___runtime_7.14.0.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.13.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz"; - sha1 = "47d42a57b6095f4468da440388fdbad8bebf0d7d"; + name = "_babel_runtime___runtime_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz"; + sha1 = "46794bc20b612c5f75e62dd071e24dfd95f1cbe6"; }; } { @@ -962,19 +994,19 @@ }; } { - name = "_babel_traverse___traverse_7.13.0.tgz"; + name = "_babel_traverse___traverse_7.14.0.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.0.tgz"; - sha1 = "6d95752475f86ee7ded06536de309a65fc8966cc"; + name = "_babel_traverse___traverse_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.0.tgz"; + sha1 = "cea0dc8ae7e2b1dec65f512f39f3483e8cc95aef"; }; } { - name = "_babel_types___types_7.13.12.tgz"; + name = "_babel_types___types_7.14.1.tgz"; path = fetchurl { - name = "_babel_types___types_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.13.12.tgz"; - sha1 = "edbf99208ef48852acdff1c8a681a1e4ade580cd"; + name = "_babel_types___types_7.14.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz"; + sha1 = "095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db"; }; } { @@ -986,11 +1018,11 @@ }; } { - name = "_codemirror_autocomplete___autocomplete_0.18.3.tgz"; + name = "_codemirror_autocomplete___autocomplete_0.18.5.tgz"; path = fetchurl { - name = "_codemirror_autocomplete___autocomplete_0.18.3.tgz"; - url = "https://registry.yarnpkg.com/@codemirror/autocomplete/-/autocomplete-0.18.3.tgz"; - sha1 = "6c75904c1156e4d9a00e56b9a3e559dda6149e1e"; + name = "_codemirror_autocomplete___autocomplete_0.18.5.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/autocomplete/-/autocomplete-0.18.5.tgz"; + sha1 = "5c25ddbef858503920fa4912b48bf78be93ee462"; }; } { @@ -1002,11 +1034,11 @@ }; } { - name = "_codemirror_commands___commands_0.18.0.tgz"; + name = "_codemirror_commands___commands_0.18.2.tgz"; path = fetchurl { - name = "_codemirror_commands___commands_0.18.0.tgz"; - url = "https://registry.yarnpkg.com/@codemirror/commands/-/commands-0.18.0.tgz"; - sha1 = "10344d7d7a0fecad826e9853c1e6069d706298c6"; + name = "_codemirror_commands___commands_0.18.2.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/commands/-/commands-0.18.2.tgz"; + sha1 = "a90067b1e3127ffe2c1be2daa68c0f4aeda59308"; }; } { @@ -1034,19 +1066,19 @@ }; } { - name = "_codemirror_language___language_0.18.0.tgz"; + name = "_codemirror_language___language_0.18.1.tgz"; path = fetchurl { - name = "_codemirror_language___language_0.18.0.tgz"; - url = "https://registry.yarnpkg.com/@codemirror/language/-/language-0.18.0.tgz"; - sha1 = "16c3beaf372d0ecfcb76d708a8f55efccaa25563"; + name = "_codemirror_language___language_0.18.1.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/language/-/language-0.18.1.tgz"; + sha1 = "23682324228606c4ae5b6a9f7cd0a4b9fdff83dd"; }; } { - name = "_codemirror_lint___lint_0.18.1.tgz"; + name = "_codemirror_lint___lint_0.18.2.tgz"; path = fetchurl { - name = "_codemirror_lint___lint_0.18.1.tgz"; - url = "https://registry.yarnpkg.com/@codemirror/lint/-/lint-0.18.1.tgz"; - sha1 = "ef5502d3bc27eaf23c670fa888bd23d09b59af55"; + name = "_codemirror_lint___lint_0.18.2.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/lint/-/lint-0.18.2.tgz"; + sha1 = "d80adb1767b486894e921785b5e82fa435d28ecf"; }; } { @@ -1066,11 +1098,11 @@ }; } { - name = "_codemirror_rangeset___rangeset_0.18.0.tgz"; + name = "_codemirror_rangeset___rangeset_0.18.1.tgz"; path = fetchurl { - name = "_codemirror_rangeset___rangeset_0.18.0.tgz"; - url = "https://registry.yarnpkg.com/@codemirror/rangeset/-/rangeset-0.18.0.tgz"; - sha1 = "8b3bec00c1cee8c3db3827a752a76819ead2dfab"; + name = "_codemirror_rangeset___rangeset_0.18.1.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/rangeset/-/rangeset-0.18.1.tgz"; + sha1 = "0e51e1117fa5aae0134073735a07c659f334a699"; }; } { @@ -1082,11 +1114,11 @@ }; } { - name = "_codemirror_state___state_0.18.3.tgz"; + name = "_codemirror_state___state_0.18.7.tgz"; path = fetchurl { - name = "_codemirror_state___state_0.18.3.tgz"; - url = "https://registry.yarnpkg.com/@codemirror/state/-/state-0.18.3.tgz"; - sha1 = "f275293b077d6c3867c0343320d6b29c10e54f84"; + name = "_codemirror_state___state_0.18.7.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/state/-/state-0.18.7.tgz"; + sha1 = "3339a732387bb2c034987c57ccf0649ef2f7c4c1"; }; } { @@ -1106,11 +1138,11 @@ }; } { - name = "_codemirror_view___view_0.18.3.tgz"; + name = "_codemirror_view___view_0.18.11.tgz"; path = fetchurl { - name = "_codemirror_view___view_0.18.3.tgz"; - url = "https://registry.yarnpkg.com/@codemirror/view/-/view-0.18.3.tgz"; - sha1 = "31ffcd0a073124b95feac47d2a3a03bfb3546fca"; + name = "_codemirror_view___view_0.18.11.tgz"; + url = "https://registry.yarnpkg.com/@codemirror/view/-/view-0.18.11.tgz"; + sha1 = "3a9655758f0743cc57d718723b57ea49a72cdfa7"; }; } { @@ -1129,6 +1161,14 @@ sha1 = "f0950bba18819512d42f7197e56c518aa491cf18"; }; } + { + name = "_forevolve_bootstrap_dark___bootstrap_dark_1.0.0.tgz"; + path = fetchurl { + name = "_forevolve_bootstrap_dark___bootstrap_dark_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@forevolve/bootstrap-dark/-/bootstrap-dark-1.0.0.tgz"; + sha1 = "05fb14e73fbf5ce159a5ba5d1aee151a57c79bca"; + }; + } { name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.35.tgz"; path = fetchurl { @@ -1322,11 +1362,11 @@ }; } { - name = "_sinonjs_commons___commons_1.8.2.tgz"; + name = "_sinonjs_commons___commons_1.8.3.tgz"; path = fetchurl { - name = "_sinonjs_commons___commons_1.8.2.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz"; - sha1 = "858f5c4b48d80778fde4b9d541f27edc0d56488b"; + name = "_sinonjs_commons___commons_1.8.3.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz"; + sha1 = "3802ddd21a50a949b6721ddd72da36e67e7f1b2d"; }; } { @@ -1586,11 +1626,11 @@ }; } { - name = "_types_jest___jest_26.0.21.tgz"; + name = "_types_jest___jest_26.0.23.tgz"; path = fetchurl { - name = "_types_jest___jest_26.0.21.tgz"; - url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.21.tgz"; - sha1 = "3a73c2731e7e4f0fbaea56ce7ff8c79cf812bd24"; + name = "_types_jest___jest_26.0.23.tgz"; + url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.23.tgz"; + sha1 = "a1b7eab3c503b80451d019efb588ec63522ee4e7"; }; } { @@ -1618,11 +1658,11 @@ }; } { - name = "_types_minimatch___minimatch_3.0.3.tgz"; + name = "_types_minimatch___minimatch_3.0.4.tgz"; path = fetchurl { - name = "_types_minimatch___minimatch_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha1 = "3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"; + name = "_types_minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "f0ec25dbf2f0e4b18647313ac031134ca5b24b21"; }; } { @@ -1634,19 +1674,19 @@ }; } { - name = "_types_node___node_14.14.35.tgz"; + name = "_types_node___node_15.0.2.tgz"; path = fetchurl { - name = "_types_node___node_14.14.35.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.35.tgz"; - sha1 = "42c953a4e2b18ab931f72477e7012172f4ffa313"; + name = "_types_node___node_15.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz"; + sha1 = "51e9c0920d1b45936ea04341aa3e2e58d339fb67"; }; } { - name = "_types_node___node_12.20.6.tgz"; + name = "_types_node___node_12.20.12.tgz"; path = fetchurl { - name = "_types_node___node_12.20.6.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.20.6.tgz"; - sha1 = "7b73cce37352936e628c5ba40326193443cfba25"; + name = "_types_node___node_12.20.12.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-12.20.12.tgz"; + sha1 = "fd9c1c2cfab536a2383ed1ef70f94adea743a226"; }; } { @@ -1714,19 +1754,19 @@ }; } { - name = "_types_react___react_17.0.3.tgz"; + name = "_types_react___react_17.0.5.tgz"; path = fetchurl { - name = "_types_react___react_17.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-17.0.3.tgz"; - sha1 = "ba6e215368501ac3826951eef2904574c262cc79"; + name = "_types_react___react_17.0.5.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-17.0.5.tgz"; + sha1 = "3d887570c4489011f75a3fc8f965bf87d09a1bea"; }; } { - name = "_types_react___react_16.14.5.tgz"; + name = "_types_react___react_16.14.6.tgz"; path = fetchurl { - name = "_types_react___react_16.14.5.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.14.5.tgz"; - sha1 = "2c39b5cadefaf4829818f9219e5e093325979f4d"; + name = "_types_react___react_16.14.6.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.14.6.tgz"; + sha1 = "d933a2a6bc1bfe320a5eea480e8f45ba8126d6ee"; }; } { @@ -1738,11 +1778,11 @@ }; } { - name = "_types_sanitize_html___sanitize_html_1.27.1.tgz"; + name = "_types_sanitize_html___sanitize_html_1.27.2.tgz"; path = fetchurl { - name = "_types_sanitize_html___sanitize_html_1.27.1.tgz"; - url = "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.27.1.tgz"; - sha1 = "1fc4b67edd6296eeb366960d13cd01f5d6bffdcd"; + name = "_types_sanitize_html___sanitize_html_1.27.2.tgz"; + url = "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.27.2.tgz"; + sha1 = "f7bf16ca4b1408278f97ae737f0377a08a10b35c"; }; } { @@ -1770,11 +1810,11 @@ }; } { - name = "_types_sizzle___sizzle_2.3.2.tgz"; + name = "_types_sizzle___sizzle_2.3.3.tgz"; path = fetchurl { - name = "_types_sizzle___sizzle_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz"; - sha1 = "a811b8c18e2babab7d542b3365887ae2e4d9de47"; + name = "_types_sizzle___sizzle_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.3.tgz"; + sha1 = "ff5e2f1902969d305225a047c8a0fd5c915cebef"; }; } { @@ -2090,11 +2130,11 @@ }; } { - name = "acorn___acorn_8.1.0.tgz"; + name = "acorn___acorn_8.2.4.tgz"; path = fetchurl { - name = "acorn___acorn_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz"; - sha1 = "52311fd7037ae119cbb134309e901aa46295b3fe"; + name = "acorn___acorn_8.2.4.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz"; + sha1 = "caba24b08185c3b56e3168e97d15ed17f4d31fd0"; }; } { @@ -2178,11 +2218,11 @@ }; } { - name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; + name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; path = fetchurl { - name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; - sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; + name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; + sha1 = "6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"; }; } { @@ -2258,11 +2298,11 @@ }; } { - name = "anymatch___anymatch_3.1.1.tgz"; + name = "anymatch___anymatch_3.1.2.tgz"; path = fetchurl { - name = "anymatch___anymatch_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz"; - sha1 = "c55ecf02185e2469259399310c173ce31233b142"; + name = "anymatch___anymatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; + sha1 = "c0557c096af32f106198f4f4e2a383537e378716"; }; } { @@ -2554,11 +2594,11 @@ }; } { - name = "axe_core___axe_core_4.1.3.tgz"; + name = "axe_core___axe_core_4.2.0.tgz"; path = fetchurl { - name = "axe_core___axe_core_4.1.3.tgz"; - url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.3.tgz"; - sha1 = "64a4c85509e0991f5168340edc4bedd1ceea6966"; + name = "axe_core___axe_core_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.2.0.tgz"; + sha1 = "6594db4ee62f78be79e32a7295d21b099b60668d"; }; } { @@ -2650,27 +2690,27 @@ }; } { - name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.1.10.tgz"; + name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.2.0.tgz"; path = fetchurl { - name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.1.10.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz"; - sha1 = "a2c5c245f56c0cac3dbddbf0726a46b24f0f81d1"; + name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz"; + sha1 = "686775bf9a5aa757e10520903675e3889caeedc4"; }; } { - name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.1.7.tgz"; + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.2.0.tgz"; path = fetchurl { - name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.1.7.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz"; - sha1 = "80449d9d6f2274912e05d9e182b54816904befd0"; + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz"; + sha1 = "f4b4bb7b19329827df36ff56f6e6d367026cb7a2"; }; } { - name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.1.6.tgz"; + name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.2.0.tgz"; path = fetchurl { - name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.1.6.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.6.tgz"; - sha1 = "0fe06a026fe0faa628ccc8ba3302da0a6ce02f3f"; + name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz"; + sha1 = "853f5f5716f4691d98c84f8069c7636ea8da7ab8"; }; } { @@ -2730,11 +2770,11 @@ }; } { - name = "balanced_match___balanced_match_1.0.0.tgz"; + name = "balanced_match___balanced_match_1.0.2.tgz"; path = fetchurl { - name = "balanced_match___balanced_match_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; }; } { @@ -2962,11 +3002,11 @@ }; } { - name = "browserslist___browserslist_4.16.3.tgz"; + name = "browserslist___browserslist_4.16.6.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.16.3.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz"; - sha1 = "340aa46940d7db878748567c5dea24a48ddf3717"; + name = "browserslist___browserslist_4.16.6.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz"; + sha1 = "d7901277a5a88e554ed305b183ec9b0c08f66fa2"; }; } { @@ -3130,11 +3170,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001204.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001223.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001204.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001204.tgz"; - sha1 = "256c85709a348ec4d175e847a3b515c66e79f2aa"; + name = "caniuse_lite___caniuse_lite_1.0.30001223.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz"; + sha1 = "39b49ff0bfb3ee3587000d2f66c47addc6e14443"; }; } { @@ -3178,11 +3218,11 @@ }; } { - name = "chalk___chalk_4.1.0.tgz"; + name = "chalk___chalk_4.1.1.tgz"; path = fetchurl { - name = "chalk___chalk_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; - sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; + name = "chalk___chalk_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; + sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; }; } { @@ -3194,27 +3234,19 @@ }; } { - name = "cheerio_select_tmp___cheerio_select_tmp_0.1.1.tgz"; + name = "cheerio_select___cheerio_select_1.4.0.tgz"; path = fetchurl { - name = "cheerio_select_tmp___cheerio_select_tmp_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/cheerio-select-tmp/-/cheerio-select-tmp-0.1.1.tgz"; - sha1 = "55bbef02a4771710195ad736d5e346763ca4e646"; + name = "cheerio_select___cheerio_select_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.4.0.tgz"; + sha1 = "3a16f21e37a2ef0f211d6d1aa4eff054bb22cdc9"; }; } { - name = "cheerio___cheerio_1.0.0_rc.5.tgz"; + name = "cheerio___cheerio_1.0.0_rc.9.tgz"; path = fetchurl { - name = "cheerio___cheerio_1.0.0_rc.5.tgz"; - url = "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.5.tgz"; - sha1 = "88907e1828674e8f9fee375188b27dadd4f0fa2f"; - }; - } - { - name = "chokidar___chokidar_2.1.8.tgz"; - path = fetchurl { - name = "chokidar___chokidar_2.1.8.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz"; - sha1 = "804b3a7b6a99358c3c5c61e71d8728f041cff917"; + name = "cheerio___cheerio_1.0.0_rc.9.tgz"; + url = "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.9.tgz"; + sha1 = "a3ae6b7ce7af80675302ff836f628e7cb786a67f"; }; } { @@ -3225,6 +3257,14 @@ sha1 = "ee9ce7bbebd2b79f49f304799d5468e31e14e68a"; }; } + { + name = "chokidar___chokidar_2.1.8.tgz"; + path = fetchurl { + name = "chokidar___chokidar_2.1.8.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz"; + sha1 = "804b3a7b6a99358c3c5c61e71d8728f041cff917"; + }; + } { name = "chownr___chownr_1.1.4.tgz"; path = fetchurl { @@ -3234,11 +3274,11 @@ }; } { - name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz"; + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; path = fetchurl { - name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"; - sha1 = "234090ee97c7d4ad1a2c4beae27505deffc608a4"; + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; + sha1 = "1015eced4741e15d06664a957dbbf50d041e26ac"; }; } { @@ -3266,11 +3306,11 @@ }; } { - name = "classnames___classnames_2.2.6.tgz"; + name = "classnames___classnames_2.3.1.tgz"; path = fetchurl { - name = "classnames___classnames_2.2.6.tgz"; - url = "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz"; - sha1 = "43935bffdd291f326dad0a205309b38d00f650ce"; + name = "classnames___classnames_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz"; + sha1 = "dfcfa3891e306ec1dad105d0e88f4417b8535e8e"; }; } { @@ -3354,11 +3394,11 @@ }; } { - name = "codemirror_promql___codemirror_promql_0.14.0.tgz"; + name = "codemirror_promql___codemirror_promql_0.15.0.tgz"; path = fetchurl { - name = "codemirror_promql___codemirror_promql_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/codemirror-promql/-/codemirror-promql-0.14.0.tgz"; - sha1 = "a5ad500e68a379ba6bded40ec0f9ff2940015bcd"; + name = "codemirror_promql___codemirror_promql_0.15.0.tgz"; + url = "https://registry.yarnpkg.com/codemirror-promql/-/codemirror-promql-0.15.0.tgz"; + sha1 = "dd6365ea5c2d18421d225cef12b74e64d8cab280"; }; } { @@ -3634,19 +3674,19 @@ }; } { - name = "core_js_compat___core_js_compat_3.9.1.tgz"; + name = "core_js_compat___core_js_compat_3.12.0.tgz"; path = fetchurl { - name = "core_js_compat___core_js_compat_3.9.1.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.9.1.tgz"; - sha1 = "4e572acfe90aff69d76d8c37759d21a5c59bb455"; + name = "core_js_compat___core_js_compat_3.12.0.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.12.0.tgz"; + sha1 = "a031e51fe411085e33cb629bfee2acaa53bc309a"; }; } { - name = "core_js_pure___core_js_pure_3.9.1.tgz"; + name = "core_js_pure___core_js_pure_3.12.0.tgz"; path = fetchurl { - name = "core_js_pure___core_js_pure_3.9.1.tgz"; - url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.9.1.tgz"; - sha1 = "677b322267172bd490e4464696f790cbc355bec5"; + name = "core_js_pure___core_js_pure_3.12.0.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.12.0.tgz"; + sha1 = "c59d45954a6569232f0704d085916a5e8c3b272f"; }; } { @@ -3658,11 +3698,11 @@ }; } { - name = "core_js___core_js_3.9.1.tgz"; + name = "core_js___core_js_3.12.0.tgz"; path = fetchurl { - name = "core_js___core_js_3.9.1.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.9.1.tgz"; - sha1 = "cec8de593db8eb2a85ffb0dbdeb312cb6e5460ae"; + name = "core_js___core_js_3.12.0.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.12.0.tgz"; + sha1 = "62bac86f7d7f087d40dba3e90a211c2c3c8559ea"; }; } { @@ -3730,11 +3770,11 @@ }; } { - name = "cross_fetch___cross_fetch_3.1.2.tgz"; + name = "cross_fetch___cross_fetch_3.1.4.tgz"; path = fetchurl { - name = "cross_fetch___cross_fetch_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.2.tgz"; - sha1 = "ee0c2f18844c4fde36150c2a4ddc068d20c1bc41"; + name = "cross_fetch___cross_fetch_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz"; + sha1 = "9723f3a3a247bf8b89039f3a380a9244e8fa2f39"; }; } { @@ -3826,11 +3866,11 @@ }; } { - name = "css_select___css_select_3.1.2.tgz"; + name = "css_select___css_select_4.1.2.tgz"; path = fetchurl { - name = "css_select___css_select_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/css-select/-/css-select-3.1.2.tgz"; - sha1 = "d52cbdc6fee379fba97fb0d3925abbd18af2d9d8"; + name = "css_select___css_select_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-4.1.2.tgz"; + sha1 = "8b52b6714ed3a80d8221ec971c543f3b12653286"; }; } { @@ -3842,11 +3882,11 @@ }; } { - name = "css_tree___css_tree_1.1.2.tgz"; + name = "css_tree___css_tree_1.1.3.tgz"; path = fetchurl { - name = "css_tree___css_tree_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.2.tgz"; - sha1 = "9ae393b5dafd7dae8a622475caec78d3d8fbd7b5"; + name = "css_tree___css_tree_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz"; + sha1 = "eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"; }; } { @@ -3858,11 +3898,11 @@ }; } { - name = "css_what___css_what_4.0.0.tgz"; + name = "css_what___css_what_5.0.0.tgz"; path = fetchurl { - name = "css_what___css_what_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/css-what/-/css-what-4.0.0.tgz"; - sha1 = "35e73761cab2eeb3d3661126b23d7aa0e8432233"; + name = "css_what___css_what_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-5.0.0.tgz"; + sha1 = "f0bf4f8bac07582722346ab243f6a35b512cfc47"; }; } { @@ -3906,11 +3946,11 @@ }; } { - name = "cssnano_preset_default___cssnano_preset_default_4.0.7.tgz"; + name = "cssnano_preset_default___cssnano_preset_default_4.0.8.tgz"; path = fetchurl { - name = "cssnano_preset_default___cssnano_preset_default_4.0.7.tgz"; - url = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz"; - sha1 = "51ec662ccfca0f88b396dcd9679cdb931be17f76"; + name = "cssnano_preset_default___cssnano_preset_default_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz"; + sha1 = "920622b1fc1e95a34e8838203f1397a504f2d3ff"; }; } { @@ -3946,11 +3986,11 @@ }; } { - name = "cssnano___cssnano_4.1.10.tgz"; + name = "cssnano___cssnano_4.1.11.tgz"; path = fetchurl { - name = "cssnano___cssnano_4.1.10.tgz"; - url = "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz"; - sha1 = "0ac41f0b13d13d465487e111b778d42da631b8b2"; + name = "cssnano___cssnano_4.1.11.tgz"; + url = "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.11.tgz"; + sha1 = "c7b5f5b81da269cb1fd982cb960c1200910c9a99"; }; } { @@ -3994,11 +4034,11 @@ }; } { - name = "csstype___csstype_3.0.7.tgz"; + name = "csstype___csstype_3.0.8.tgz"; path = fetchurl { - name = "csstype___csstype_3.0.7.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.7.tgz"; - sha1 = "2a5fb75e1015e84dd15692f71e89a1450290950b"; + name = "csstype___csstype_3.0.8.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz"; + sha1 = "d2266a792729fb227cd216fb572f43728e1ad340"; }; } { @@ -4018,11 +4058,11 @@ }; } { - name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.7.tgz"; path = fetchurl { - name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz"; - sha1 = "143c1641cb3d85c60c32329e26899adea8701791"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz"; + sha1 = "64368003512a1a6992593741a09a9d31a836f55d"; }; } { @@ -4113,6 +4153,14 @@ sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; }; } + { + name = "deepmerge___deepmerge_4.2.2.tgz"; + path = fetchurl { + name = "deepmerge___deepmerge_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz"; + sha1 = "44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"; + }; + } { name = "default_gateway___default_gateway_4.2.0.tgz"; path = fetchurl { @@ -4338,11 +4386,11 @@ }; } { - name = "dom_serializer___dom_serializer_1.2.0.tgz"; + name = "dom_serializer___dom_serializer_1.3.1.tgz"; path = fetchurl { - name = "dom_serializer___dom_serializer_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.2.0.tgz"; - sha1 = "3433d9136aeb3c627981daa385fc7f32d27c48f1"; + name = "dom_serializer___dom_serializer_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.1.tgz"; + sha1 = "d845a1565d7c041a95e5dab62184ab41e3a519be"; }; } { @@ -4362,11 +4410,11 @@ }; } { - name = "domelementtype___domelementtype_2.1.0.tgz"; + name = "domelementtype___domelementtype_2.2.0.tgz"; path = fetchurl { - name = "domelementtype___domelementtype_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz"; - sha1 = "a851c080a6d1c3d94344aed151d99f669edf585e"; + name = "domelementtype___domelementtype_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz"; + sha1 = "9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"; }; } { @@ -4402,11 +4450,11 @@ }; } { - name = "domhandler___domhandler_4.0.0.tgz"; + name = "domhandler___domhandler_4.2.0.tgz"; path = fetchurl { - name = "domhandler___domhandler_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/domhandler/-/domhandler-4.0.0.tgz"; - sha1 = "01ea7821de996d85f69029e81fa873c21833098e"; + name = "domhandler___domhandler_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz"; + sha1 = "f9768a5f034be60a89a27c2e4d0f74eba0d8b059"; }; } { @@ -4418,11 +4466,11 @@ }; } { - name = "domutils___domutils_2.5.0.tgz"; + name = "domutils___domutils_2.6.0.tgz"; path = fetchurl { - name = "domutils___domutils_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/domutils/-/domutils-2.5.0.tgz"; - sha1 = "42f49cffdabb92ad243278b331fd761c1c2d3039"; + name = "domutils___domutils_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-2.6.0.tgz"; + sha1 = "2e15c04185d43fb16ae7057cb76433c6edb938b7"; }; } { @@ -4498,11 +4546,11 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.698.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.727.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.698.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.698.tgz"; - sha1 = "5de813960f23581a268718a0058683dffa15d221"; + name = "electron_to_chromium___electron_to_chromium_1.3.727.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz"; + sha1 = "857e310ca00f0b75da4e1db6ff0e073cc4a91ddf"; }; } { @@ -4593,14 +4641,6 @@ sha1 = "098dc90ebb83d8dffa089d55256b351d34c4da55"; }; } - { - name = "entities___entities_2.1.0.tgz"; - path = fetchurl { - name = "entities___entities_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz"; - sha1 = "992d3129cf7df6870b96c57858c249a120f8b8b5"; - }; - } { name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.6.tgz"; path = fetchurl { @@ -4626,11 +4666,11 @@ }; } { - name = "enzyme_to_json___enzyme_to_json_3.6.1.tgz"; + name = "enzyme_to_json___enzyme_to_json_3.6.2.tgz"; path = fetchurl { - name = "enzyme_to_json___enzyme_to_json_3.6.1.tgz"; - url = "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.6.1.tgz"; - sha1 = "d60740950bc7ca6384dfe6fe405494ec5df996bc"; + name = "enzyme_to_json___enzyme_to_json_3.6.2.tgz"; + url = "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.6.2.tgz"; + sha1 = "94f85c413bcae8ab67be53b0a94b69a560e27823"; }; } { @@ -4729,6 +4769,14 @@ sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; } + { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + }; + } { name = "escodegen___escodegen_1.14.3.tgz"; path = fetchurl { @@ -4834,11 +4882,11 @@ }; } { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.3.1.tgz"; + name = "eslint_plugin_prettier___eslint_plugin_prettier_3.4.0.tgz"; path = fetchurl { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz"; - sha1 = "7079cfa2497078905011e6f82e8dd8453d1371b7"; + name = "eslint_plugin_prettier___eslint_plugin_prettier_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz"; + sha1 = "cdbad3bf1dbd2b177e9825737fe63b476a08f0c7"; }; } { @@ -4866,11 +4914,11 @@ }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.23.1.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.23.2.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.23.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.23.1.tgz"; - sha1 = "f1a2e844c0d1967c822388204a8bc4dee8415b11"; + name = "eslint_plugin_react___eslint_plugin_react_7.23.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.23.2.tgz"; + sha1 = "2d2291b0f95c03728b55869f01102290e792d494"; }; } { @@ -5354,11 +5402,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.13.3.tgz"; + name = "follow_redirects___follow_redirects_1.14.0.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.13.3.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz"; - sha1 = "e5598ad50174c1bc4e872301e82ac2cd97f90267"; + name = "follow_redirects___follow_redirects_1.14.0.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz"; + sha1 = "f5d260f95c5f8c105894491feee5dc8993b402fe"; }; } { @@ -5762,11 +5810,11 @@ }; } { - name = "harmony_reflect___harmony_reflect_1.6.1.tgz"; + name = "harmony_reflect___harmony_reflect_1.6.2.tgz"; path = fetchurl { - name = "harmony_reflect___harmony_reflect_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.1.tgz"; - sha1 = "c108d4f2bb451efef7a37861fdbdae72c9bdefa9"; + name = "harmony_reflect___harmony_reflect_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz"; + sha1 = "31ecbd32e648a34d030d86adb67d4d47547fe710"; }; } { @@ -5890,11 +5938,11 @@ }; } { - name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; - sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488"; + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha1 = "dffc0bf9a21c02209090f2aa69429e1414daf3f9"; }; } { @@ -5921,14 +5969,6 @@ sha1 = "c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"; }; } - { - name = "html_comment_regex___html_comment_regex_1.1.2.tgz"; - path = fetchurl { - name = "html_comment_regex___html_comment_regex_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz"; - sha1 = "97d4688aeb5c81886a364faa0cad1dda14d433a7"; - }; - } { name = "html_element_map___html_element_map_1.3.0.tgz"; path = fetchurl { @@ -6002,11 +6042,11 @@ }; } { - name = "htmlparser2___htmlparser2_6.0.1.tgz"; + name = "htmlparser2___htmlparser2_6.1.0.tgz"; path = fetchurl { - name = "htmlparser2___htmlparser2_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.0.1.tgz"; - sha1 = "422521231ef6d42e56bd411da8ba40aa36e91446"; + name = "htmlparser2___htmlparser2_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz"; + sha1 = "c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"; }; } { @@ -6386,11 +6426,11 @@ }; } { - name = "is_bigint___is_bigint_1.0.1.tgz"; + name = "is_bigint___is_bigint_1.0.2.tgz"; path = fetchurl { - name = "is_bigint___is_bigint_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz"; - sha1 = "6923051dfcbc764278540b9ce0e6b3213aa5ebc2"; + name = "is_bigint___is_bigint_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz"; + sha1 = "ffb381442503235ad245ea89e45b3dbff040ee5a"; }; } { @@ -6450,11 +6490,11 @@ }; } { - name = "is_core_module___is_core_module_2.2.0.tgz"; + name = "is_core_module___is_core_module_2.3.0.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz"; - sha1 = "97037ef3d52224d85163f5597b2b63d9afed981a"; + name = "is_core_module___is_core_module_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz"; + sha1 = "d341652e3408bca69c4671b79a0954a3d349f887"; }; } { @@ -6474,11 +6514,11 @@ }; } { - name = "is_date_object___is_date_object_1.0.2.tgz"; + name = "is_date_object___is_date_object_1.0.3.tgz"; path = fetchurl { - name = "is_date_object___is_date_object_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz"; - sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"; + name = "is_date_object___is_date_object_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.3.tgz"; + sha1 = "4c0802ae9c8097939ea8001eaae3c502f3dbe72f"; }; } { @@ -6506,11 +6546,11 @@ }; } { - name = "is_docker___is_docker_2.1.1.tgz"; + name = "is_docker___is_docker_2.2.1.tgz"; path = fetchurl { - name = "is_docker___is_docker_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz"; - sha1 = "4125a88e44e450d384e09047ede71adc2d144156"; + name = "is_docker___is_docker_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz"; + sha1 = "33eeabe23cfe86f14bde4408a02c0cfb853acdaa"; }; } { @@ -6666,11 +6706,19 @@ }; } { - name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; + name = "is_plain_object___is_plain_object_5.0.0.tgz"; path = fetchurl { - name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz"; - sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397"; + name = "is_plain_object___is_plain_object_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz"; + sha1 = "4427f50ab3429e9025ea7d52e9043a9ef4159344"; + }; + } + { + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; + path = fetchurl { + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz"; + sha1 = "171ed6f19e3ac554394edf78caa05784a45bebb5"; }; } { @@ -6729,14 +6777,6 @@ sha1 = "8a59117d932de1de00f245fcdd39ce43f1e939a6"; }; } - { - name = "is_svg___is_svg_3.0.0.tgz"; - path = fetchurl { - name = "is_svg___is_svg_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz"; - sha1 = "9321dbd29c212e5ca99c4fa9794c714bcafa2f75"; - }; - } { name = "is_symbol___is_symbol_1.0.3.tgz"; path = fetchurl { @@ -7202,11 +7242,11 @@ }; } { - name = "jsdom___jsdom_16.5.1.tgz"; + name = "jsdom___jsdom_16.5.3.tgz"; path = fetchurl { - name = "jsdom___jsdom_16.5.1.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.1.tgz"; - sha1 = "4ced6bbd7b77d67fb980e64d9e3e6fb900f97dd6"; + name = "jsdom___jsdom_16.5.3.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.3.tgz"; + sha1 = "13a755b3950eb938b4482c407238ddf16f0d2136"; }; } { @@ -7346,11 +7386,11 @@ }; } { - name = "just_extend___just_extend_4.1.1.tgz"; + name = "just_extend___just_extend_4.2.1.tgz"; path = fetchurl { - name = "just_extend___just_extend_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/just-extend/-/just-extend-4.1.1.tgz"; - sha1 = "158f1fdb01f128c411dc8b286a7b4837b3545282"; + name = "just_extend___just_extend_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz"; + sha1 = "ef5e589afb61e5d66b24eca749409a8939a8c744"; }; } { @@ -7409,6 +7449,14 @@ sha1 = "a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"; }; } + { + name = "klona___klona_2.0.4.tgz"; + path = fetchurl { + name = "klona___klona_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz"; + sha1 = "7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"; + }; + } { name = "language_subtag_registry___language_subtag_registry_0.3.21.tgz"; path = fetchurl { @@ -7890,19 +7938,19 @@ }; } { - name = "mime_db___mime_db_1.46.0.tgz"; + name = "mime_db___mime_db_1.47.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.46.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz"; - sha1 = "6267748a7f799594de3cbc8cde91def349661cee"; + name = "mime_db___mime_db_1.47.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz"; + sha1 = "8cb313e59965d3c05cfbf898915a267af46a335c"; }; } { - name = "mime_types___mime_types_2.1.29.tgz"; + name = "mime_types___mime_types_2.1.30.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.29.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz"; - sha1 = "1d4ab77da64b91f5f72489df29236563754bb1b2"; + name = "mime_types___mime_types_2.1.30.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz"; + sha1 = "6e7be8b4c479825f85ed6326695db73f9305d62d"; }; } { @@ -8145,6 +8193,14 @@ sha1 = "f5376400695168f4cc694ac9393d0c9585eeea19"; }; } + { + name = "nanoid___nanoid_3.1.22.tgz"; + path = fetchurl { + name = "nanoid___nanoid_3.1.22.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz"; + sha1 = "b35f8fb7d151990a8aebd5aa5015c03cf726f844"; + }; + } { name = "nanomatch___nanomatch_1.2.13.tgz"; path = fetchurl { @@ -8394,11 +8450,11 @@ }; } { - name = "object_inspect___object_inspect_1.9.0.tgz"; + name = "object_inspect___object_inspect_1.10.2.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz"; - sha1 = "c90521d74e1127b67266ded3394ad6116986533a"; + name = "object_inspect___object_inspect_1.10.2.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz"; + sha1 = "b6385a3e2b7cae0b5eafcf90cddf85d128767f30"; }; } { @@ -8922,11 +8978,11 @@ }; } { - name = "pbkdf2___pbkdf2_3.1.1.tgz"; + name = "pbkdf2___pbkdf2_3.1.2.tgz"; path = fetchurl { - name = "pbkdf2___pbkdf2_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz"; - sha1 = "cb8724b0fada984596856d1a6ebafd3584654b94"; + name = "pbkdf2___pbkdf2_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz"; + sha1 = "dd822aa0887580e52f1a039dc3eda108efae3075"; }; } { @@ -8938,11 +8994,11 @@ }; } { - name = "picomatch___picomatch_2.2.2.tgz"; + name = "picomatch___picomatch_2.2.3.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; - sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; + name = "picomatch___picomatch_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz"; + sha1 = "465547f359ccc206d3c48e46a1bcb89bf7ee619d"; }; } { @@ -9282,11 +9338,11 @@ }; } { - name = "postcss_initial___postcss_initial_3.0.2.tgz"; + name = "postcss_initial___postcss_initial_3.0.4.tgz"; path = fetchurl { - name = "postcss_initial___postcss_initial_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.2.tgz"; - sha1 = "f018563694b3c16ae8eaabe3c585ac6319637b2d"; + name = "postcss_initial___postcss_initial_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.4.tgz"; + sha1 = "9d32069a10531fe2ecafa0b6ac750ee0bc7efc53"; }; } { @@ -9610,19 +9666,19 @@ }; } { - name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.5.tgz"; path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz"; - sha1 = "56075a1380a04604c38b063ea7767a129af5c2b3"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz"; + sha1 = "042d74e137db83e6f294712096cb413f5aa612c4"; }; } { - name = "postcss_svgo___postcss_svgo_4.0.2.tgz"; + name = "postcss_svgo___postcss_svgo_4.0.3.tgz"; path = fetchurl { - name = "postcss_svgo___postcss_svgo_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz"; - sha1 = "17b997bc711b333bab143aaed3b8d3d6e3d38258"; + name = "postcss_svgo___postcss_svgo_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz"; + sha1 = "343a2cdbac9505d416243d496f724f38894c941e"; }; } { @@ -9673,6 +9729,14 @@ sha1 = "d2be00b998f7f211d8a276974079f2e92b970e24"; }; } + { + name = "postcss___postcss_8.2.14.tgz"; + path = fetchurl { + name = "postcss___postcss_8.2.14.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.2.14.tgz"; + sha1 = "dcf313eb8247b3ce8078d048c0e8262ca565ad2b"; + }; + } { name = "prelude_ls___prelude_ls_1.1.2.tgz"; path = fetchurl { @@ -9786,11 +9850,11 @@ }; } { - name = "prompts___prompts_2.4.0.tgz"; + name = "prompts___prompts_2.4.1.tgz"; path = fetchurl { - name = "prompts___prompts_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz"; - sha1 = "4aa5de0723a231d1ee9121c40fdf663df73f61d7"; + name = "prompts___prompts_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz"; + sha1 = "befd3b1195ba052f9fd2fde8a486c4e82ee77f61"; }; } { @@ -9946,11 +10010,11 @@ }; } { - name = "raf_schd___raf_schd_4.0.2.tgz"; + name = "raf_schd___raf_schd_4.0.3.tgz"; path = fetchurl { - name = "raf_schd___raf_schd_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.2.tgz"; - sha1 = "bd44c708188f2e84c810bf55fcea9231bcaed8a0"; + name = "raf_schd___raf_schd_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.3.tgz"; + sha1 = "5d6c34ef46f8b2a0e880a8fcdb743efc5bfdbc1a"; }; } { @@ -10346,11 +10410,11 @@ }; } { - name = "repeat_element___repeat_element_1.1.3.tgz"; + name = "repeat_element___repeat_element_1.1.4.tgz"; path = fetchurl { - name = "repeat_element___repeat_element_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz"; - sha1 = "782e0d825c0c5a3bb39731f84efee6b742e6b1ce"; + name = "repeat_element___repeat_element_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz"; + sha1 = "be681520847ab58c7568ac75fbfad28ed42d39e9"; }; } { @@ -10602,11 +10666,11 @@ }; } { - name = "rxjs___rxjs_6.6.6.tgz"; + name = "rxjs___rxjs_6.6.7.tgz"; path = fetchurl { - name = "rxjs___rxjs_6.6.6.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.6.tgz"; - sha1 = "14d8417aa5a07c5e633995b525e1e3c0dec03b70"; + name = "rxjs___rxjs_6.6.7.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz"; + sha1 = "90ac018acabf491bf65044235d5863c4dab804c9"; }; } { @@ -10650,11 +10714,11 @@ }; } { - name = "sanitize_html___sanitize_html_1.27.5.tgz"; + name = "sanitize_html___sanitize_html_2.3.3.tgz"; path = fetchurl { - name = "sanitize_html___sanitize_html_1.27.5.tgz"; - url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.27.5.tgz"; - sha1 = "6c8149462adb23e360e1bb71cc0bae7f08c823c7"; + name = "sanitize_html___sanitize_html_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.3.3.tgz"; + sha1 = "3db382c9a621cce4c46d90f10c64f1e9da9e8353"; }; } { @@ -10673,6 +10737,14 @@ sha1 = "debecd8c3ce243c76454f2e8290482150380090d"; }; } + { + name = "sass___sass_1.32.10.tgz"; + path = fetchurl { + name = "sass___sass_1.32.10.tgz"; + url = "https://registry.yarnpkg.com/sass/-/sass-1.32.10.tgz"; + sha1 = "d40da4e20031b450359ee1c7e69bc8cc89569241"; + }; + } { name = "sax___sax_1.2.4.tgz"; path = fetchurl { @@ -10730,11 +10802,11 @@ }; } { - name = "selfsigned___selfsigned_1.10.8.tgz"; + name = "selfsigned___selfsigned_1.10.11.tgz"; path = fetchurl { - name = "selfsigned___selfsigned_1.10.8.tgz"; - url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz"; - sha1 = "0d17208b7d12c33f8eac85c41835f27fc3d81a30"; + name = "selfsigned___selfsigned_1.10.11.tgz"; + url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz"; + sha1 = "24929cd906fe0f44b6d01fb23999a739537acbe9"; }; } { @@ -11154,11 +11226,11 @@ }; } { - name = "ssri___ssri_6.0.1.tgz"; + name = "ssri___ssri_6.0.2.tgz"; path = fetchurl { - name = "ssri___ssri_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz"; - sha1 = "2a3c41b28dd45b62b63676ecb74001265ae9edd8"; + name = "ssri___ssri_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz"; + sha1 = "157939134f20464e7301ddba3e90ffa8f7728ac5"; }; } { @@ -11178,11 +11250,11 @@ }; } { - name = "stack_utils___stack_utils_1.0.4.tgz"; + name = "stack_utils___stack_utils_1.0.5.tgz"; path = fetchurl { - name = "stack_utils___stack_utils_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.4.tgz"; - sha1 = "4b600971dcfc6aed0cbdf2a8268177cc916c87c8"; + name = "stack_utils___stack_utils_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.5.tgz"; + sha1 = "a19b0b01947e0029c8e451d5d61a498f5bb1471b"; }; } { @@ -11746,11 +11818,11 @@ }; } { - name = "tslib___tslib_2.1.0.tgz"; + name = "tslib___tslib_2.2.0.tgz"; path = fetchurl { - name = "tslib___tslib_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz"; - sha1 = "da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"; + name = "tslib___tslib_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz"; + sha1 = "fb2c475977e35e241311ede2693cee1ec6698f5c"; }; } { @@ -11802,11 +11874,11 @@ }; } { - name = "type_fest___type_fest_0.11.0.tgz"; + name = "type_fest___type_fest_0.21.3.tgz"; path = fetchurl { - name = "type_fest___type_fest_0.11.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz"; - sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; + name = "type_fest___type_fest_0.21.3.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz"; + sha1 = "d260a24b0198436e133fa26a524a6d65fa3b2e37"; }; } { @@ -11866,11 +11938,11 @@ }; } { - name = "unbox_primitive___unbox_primitive_1.0.0.tgz"; + name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; path = fetchurl { - name = "unbox_primitive___unbox_primitive_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.0.tgz"; - sha1 = "eeacbc4affa28e9b3d36b5eaeccc50b3251b1d3f"; + name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; + sha1 = "085e215625ec3162574dc8859abee78a59b14471"; }; } { @@ -12025,6 +12097,14 @@ sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; }; } + { + name = "use_media___use_media_1.4.0.tgz"; + path = fetchurl { + name = "use_media___use_media_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/use-media/-/use-media-1.4.0.tgz"; + sha1 = "e777bf1f382a7aacabbd1f9ce3da2b62e58b2a98"; + }; + } { name = "use___use_3.1.1.tgz"; path = fetchurl { @@ -12362,11 +12442,11 @@ }; } { - name = "whatwg_url___whatwg_url_8.4.0.tgz"; + name = "whatwg_url___whatwg_url_8.5.0.tgz"; path = fetchurl { - name = "whatwg_url___whatwg_url_8.4.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz"; - sha1 = "50fb9615b05469591d2b2bd6dfaed2942ed72837"; + name = "whatwg_url___whatwg_url_8.5.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz"; + sha1 = "7752b8464fc0903fec89aa9846fc9efe07351fd3"; }; } { @@ -12602,11 +12682,11 @@ }; } { - name = "ws___ws_7.4.4.tgz"; + name = "ws___ws_7.4.5.tgz"; path = fetchurl { - name = "ws___ws_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.4.4.tgz"; - sha1 = "383bc9742cb202292c9077ceab6f6047b17f2d59"; + name = "ws___ws_7.4.5.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz"; + sha1 = "a484dd851e9beb6fdb420027e3885e8ce48986c1"; }; } { @@ -12642,11 +12722,11 @@ }; } { - name = "y18n___y18n_4.0.1.tgz"; + name = "y18n___y18n_4.0.3.tgz"; path = fetchurl { - name = "y18n___y18n_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz"; - sha1 = "8db2b83c31c5d75099bb890b23f3094891e247d4"; + name = "y18n___y18n_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz"; + sha1 = "b5f259c82cd6e336921efd7bfd8bf560de9eeedf"; }; } { From 40f276c07d4a7999436bdbe82781d9a68bdd0737 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 19 May 2021 13:04:20 +0200 Subject: [PATCH 027/101] openmolcas: 20.10 -> 21.02 --- .../science/chemistry/openmolcas/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index cc9202493b1..af646b514af 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchFromGitLab, cmake, gfortran, perl , openblas, hdf5-cpp, python3, texlive , armadillo, mpi, globalarrays, openssh -, makeWrapper, fetchpatch +, makeWrapper } : let - version = "20.10"; - gitLabRev = "v${version}"; + version = "21.02"; + # The tag keeps moving, fix a hash instead + gitLabRev = "41cee871945ac712e86ee971425a49a8fc60a936"; python = python3.withPackages (ps : with ps; [ six pyparsing ]); @@ -18,13 +19,13 @@ in stdenv.mkDerivation { owner = "Molcas"; repo = "OpenMolcas"; rev = gitLabRev; - sha256 = "0xr9plgb0cfmxxqmd3wrhvl0hv2jqqfqzxwzs1jysq2m9cxl314v"; + sha256 = "0cap53gy1wds2qaxbijw09fqhvfxphfkr93nhp9xdq84yxh4wzv6"; }; patches = [ # Required to handle openblas multiple outputs ./openblasPath.patch -]; + ]; nativeBuildInputs = [ perl cmake texlive.combined.scheme-minimal makeWrapper ]; buildInputs = [ @@ -57,6 +58,10 @@ in stdenv.mkDerivation { export PATH=$PATH:$out/bin ''; + postInstall = '' + mv $out/pymolcas $out/bin + ''; + postFixup = '' # Wrong store path in shebang (no Python pkgs), force re-patching sed -i "1s:/.*:/usr/bin/env python:" $out/bin/pymolcas From 0b6dcc02cd23953586c6ada1d9a5e14a2f6c0c0a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 19 May 2021 02:44:30 -0400 Subject: [PATCH 028/101] libAfterImage: build shared libs by default --- pkgs/development/libraries/libAfterImage/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix index 6096c6a67b7..1f833321d90 100644 --- a/pkgs/development/libraries/libAfterImage/default.nix +++ b/pkgs/development/libraries/libAfterImage/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, giflib, libjpeg, libpng, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, giflib, libjpeg, libpng, zlib +, static ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation { pname = "libAfterImage"; @@ -52,11 +53,16 @@ stdenv.mkDerivation { rm -rf {libjpeg,libpng,libungif,zlib}/ substituteInPlace Makefile.in \ --replace "include .depend" "" + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile.in \ + --replace "-soname," "-install_name,$out/lib/" ''; configureFlags = [ "--with-gif" "--disable-mmx-optimization" + "--${if static then "enable" else "disable"}-staticlibs" + "--${if !static then "enable" else "disable"}-sharedlibs" ]; meta = with lib; { From bfaeb1bdd7d496f3b01113c7325e23c11e2b4a80 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 19 May 2021 05:12:55 -0400 Subject: [PATCH 029/101] libAfterImage: compile against libX11 This is needed to not have X_DISPLAY_MISSING for asimage2pixmap function to be implemented: https://root-forum.cern.ch/t/root-xpm-error-on-ubuntu-revisited/4552/10 --- pkgs/development/libraries/libAfterImage/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix index 1f833321d90..de463cdf42c 100644 --- a/pkgs/development/libraries/libAfterImage/default.nix +++ b/pkgs/development/libraries/libAfterImage/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, giflib, libjpeg, libpng, zlib -, static ? stdenv.hostPlatform.isStatic }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, giflib, libjpeg, libpng, libX11, zlib +, static ? stdenv.hostPlatform.isStatic +, withX ? !stdenv.isDarwin }: stdenv.mkDerivation { pname = "libAfterImage"; @@ -47,7 +48,7 @@ stdenv.mkDerivation { patchFlags = [ "-p0" ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ giflib libjpeg libpng zlib ]; + buildInputs = [ giflib libjpeg libpng zlib ] ++ lib.optional withX libX11; preConfigure = '' rm -rf {libjpeg,libpng,libungif,zlib}/ @@ -63,7 +64,7 @@ stdenv.mkDerivation { "--disable-mmx-optimization" "--${if static then "enable" else "disable"}-staticlibs" "--${if !static then "enable" else "disable"}-sharedlibs" - ]; + ] ++ lib.optional withX "--with-x"; meta = with lib; { homepage = "http://www.afterstep.org/afterimage/"; From 788306b573f3ab062dccb04f62122bf5cec2c974 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 19 May 2021 14:36:06 +0200 Subject: [PATCH 030/101] ucx: 1.10.0 -> 1.10.1 --- pkgs/development/libraries/ucx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 6f46486e549..872e7fbc4f2 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ucx"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "1j2gfw4anixb5ajgiyn7bcca8pgjvsaf0y0b2xz88s9hdx0h6gs9"; + sha256 = "1jl7wrmcpf6lakpi1gvjcs18cy0mmwgsv5wdd80zyl41cpd8gm8d"; }; nativeBuildInputs = [ autoreconfHook doxygen ]; From f26200f3b850ba7c3946dffa7a460f4b4e75ed75 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 19 May 2021 15:51:52 +0200 Subject: [PATCH 031/101] matrix-synapse: add openssl to buildInputs It should be included regardless of whether tests are run or not, and overriding the package to disable tests would break this package up until this change. --- pkgs/servers/matrix-synapse/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 21cd4a6b86c..b503bb554fe 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -24,6 +24,8 @@ buildPythonApplication rec { ./homeserver-script.patch ]; + buildInputs = [ openssl ]; + propagatedBuildInputs = [ setuptools bcrypt From 69202853ea8ae2d92c0d6344cd9446421cc2a4bd Mon Sep 17 00:00:00 2001 From: Paul Schyska Date: Wed, 19 May 2021 00:59:33 +0200 Subject: [PATCH 032/101] nixos/nsd: make nsd-checkconf work when configuration contains keys --- nixos/modules/services/networking/nsd.nix | 22 +++++++++++++++++++--- nixos/tests/nsd.nix | 9 +++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index f33c350a257..2ac0a8c7922 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -20,6 +20,15 @@ let mkZoneFileName = name: if name == "." then "root" else name; + # replaces include: directives for keys with fake keys for nsd-checkconf + injectFakeKeys = keys: concatStrings + (mapAttrsToList + (keyName: keyOptions: '' + fakeKey="$(${pkgs.bind}/bin/tsig-keygen -a ${escapeShellArgs [ keyOptions.algorithm keyName ]} | grep -oP "\s*secret \"\K.*(?=\";)")" + sed "s@^\s*include:\s*\"${stateDir}/private/${keyName}\"\$@secret: $fakeKey@" -i $out/nsd.conf + '') + keys); + nsdEnv = pkgs.buildEnv { name = "nsd-env"; @@ -34,9 +43,9 @@ let echo "|- checking zone '$out/zones/$zoneFile'" ${nsdPkg}/sbin/nsd-checkzone "$zoneFile" "$zoneFile" || { if grep -q \\\\\\$ "$zoneFile"; then - echo zone "$zoneFile" contains escaped dollar signes \\\$ - echo Escaping them is not needed any more. Please make shure \ - to unescape them where they prefix a variable name + echo zone "$zoneFile" contains escaped dollar signs \\\$ + echo Escaping them is not needed any more. Please make sure \ + to unescape them where they prefix a variable name. fi exit 1 @@ -44,7 +53,14 @@ let done echo "checking configuration file" + # Save original config file including key references... + cp $out/nsd.conf{,.orig} + # ...inject mock keys into config + ${injectFakeKeys cfg.keys} + # ...do the checkconf ${nsdPkg}/sbin/nsd-checkconf $out/nsd.conf + # ... and restore original config file. + mv $out/nsd.conf{.orig,} ''; }; diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix index a558ee0a425..7387f4f1dfa 100644 --- a/nixos/tests/nsd.nix +++ b/nixos/tests/nsd.nix @@ -43,6 +43,10 @@ in import ./make-test-python.nix ({ pkgs, ...} : { services.nsd.enable = true; services.nsd.rootServer = true; services.nsd.interfaces = lib.mkForce []; + services.nsd.keys."tsig.example.com." = { + algorithm = "hmac-sha256"; + keyFile = pkgs.writeTextFile { name = "tsig.example.com."; text = "aR3FJA92+bxRSyosadsJ8Aeeav5TngQW/H/EF9veXbc="; }; + }; services.nsd.zones."example.com.".data = '' @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600 ipv4 A 1.2.3.4 @@ -51,6 +55,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { ns A 192.168.0.1 ns AAAA dead:beef::1 ''; + services.nsd.zones."example.com.".provideXFR = [ "0.0.0.0 tsig.example.com." ]; services.nsd.zones."deleg.example.com.".data = '' @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600 @ A 9.8.7.6 @@ -71,6 +76,10 @@ in import ./make-test-python.nix ({ pkgs, ...} : { clientv6.wait_for_unit("network.target") server.wait_for_unit("nsd.service") + with subtest("server tsig.example.com."): + expected_tsig = " secret: \"aR3FJA92+bxRSyosadsJ8Aeeav5TngQW/H/EF9veXbc=\"\n" + tsig=server.succeed("cat /var/lib/nsd/private/tsig.example.com.") + assert expected_tsig == tsig, f"Expected /var/lib/nsd/private/tsig.example.com. to contain '{expected_tsig}', but found '{tsig}'" def assert_host(type, rr, query, expected): self = clientv4 if type == 4 else clientv6 From 457e319a2a53f594dc8740cc1992704b42eb37df Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 19 May 2021 14:44:02 +0000 Subject: [PATCH 033/101] pantheon.elementary-calculator: 1.6.0 -> 1.6.1 --- pkgs/desktops/pantheon/apps/elementary-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 15e0059ce87..791c2508e12 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "elementary-calculator"; - version = "1.6.0"; + version = "1.6.1"; repoName = "calculator"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-kDqUwTi3XnFGUwAjnWcaKqDylUFqpus9WurLoqbV1xk="; + sha256 = "sha256-LGY111wPldxuSfqhZ2E2TeJjexcGbfS25RjLw+Wi99c="; }; passthru = { From 5b1acc28de502e5dbe2d36976129f1c862ec87e8 Mon Sep 17 00:00:00 2001 From: Hubert Jasudowicz Date: Wed, 19 May 2021 13:11:06 +0200 Subject: [PATCH 034/101] pythonPackages.karton-autoit-ripper: 1.0.0 -> 1.0.1 --- .../python-modules/karton-autoit-ripper/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/karton-autoit-ripper/default.nix b/pkgs/development/python-modules/karton-autoit-ripper/default.nix index d1f79f42a2a..e675c055d78 100644 --- a/pkgs/development/python-modules/karton-autoit-ripper/default.nix +++ b/pkgs/development/python-modules/karton-autoit-ripper/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "karton-autoit-ripper"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "0vdsxkbjcr0inpcfjh45gl72ipzklkhgs06fdpkyy9y0cfx3zq7z"; + sha256 = "1bsqpf9w6d9fjysmnafaglg2w41gsafs2xz4dzcgc7n92shpcs8w"; }; propagatedBuildInputs = [ @@ -28,7 +28,6 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ --replace "autoit-ripper==1.0.0" "autoit-ripper" \ - --replace "karton.core==4.0.4" "karton-core" \ --replace "malduck==3.1.0" "malduck>=3.1.0" \ --replace "regex==2020.2.20" "regex>=2020.2.20" ''; From 4826ef3c7777f822dc0b3ef212df1f47ea6536e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Tue, 18 May 2021 14:52:17 -0500 Subject: [PATCH 035/101] =?UTF-8?q?metals:=200.10.2=20=E2=86=92=200.10.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index d686067e633..88bbfda5c73 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.10.2"; + version = "0.10.3"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1yck935pcj9cg3qxzrmvgd16afsckz8wgmzf2rlmii2c1glrbq9c"; + outputHash = "1psmsiwd3xlbrvkdvr2zgs2b66kw8w2jvvqa399g7jhixh2fpbx4"; }; nativeBuildInputs = [ makeWrapper ]; From 5833277e952d62ed43827c2f06d948c40765231f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 08:30:47 +0000 Subject: [PATCH 036/101] freetds: 1.2.18 -> 1.2.21 --- pkgs/development/libraries/freetds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 0a9a4684e12..56f0e03921b 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.2.18"; + version = "1.2.21"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ENR+YJhs/FH4Fw+p6rpDEU7r3eC6bmscSBPYbwIaqt0="; + sha256 = "sha256-pea79tbz3AgWsZy9CDCNJ6CEsEkmqqBaxn+AjqB9PY0="; }; buildInputs = [ From b40b6620a01e4bd33983f62238d9a6f54b90f50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Wed, 19 May 2021 21:13:44 +0200 Subject: [PATCH 037/101] bacon: fix darwin build --- pkgs/development/tools/bacon/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index 3a7e7e7ef66..1cf066e6b49 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices }: rustPlatform.buildRustPackage rec { pname = "bacon"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1pii5ajl3xgylrm20pkwbd1lk7gv0pshl1cxjfna0l63q56v7f21"; + buildInputs = lib.optional stdenv.isDarwin CoreServices; + meta = with lib; { description = "Background rust code checker"; homepage = "https://github.com/Canop/bacon"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6dae0679f8..39f0ca4478e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3238,7 +3238,9 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; - bacon = callPackage ../development/tools/bacon { }; + bacon = callPackage ../development/tools/bacon { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; bareos = callPackage ../tools/backup/bareos { }; From 029d53dbf938192adadf4bfd75032775441ee1cb Mon Sep 17 00:00:00 2001 From: Reed Date: Fri, 16 Apr 2021 17:27:32 -0400 Subject: [PATCH 038/101] r2mod_cli: 1.0.7 -> 1.2.0 --- pkgs/games/r2mod_cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/games/r2mod_cli/default.nix index 6a7d12eadb1..169385576ac 100644 --- a/pkgs/games/r2mod_cli/default.nix +++ b/pkgs/games/r2mod_cli/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "r2mod_cli"; - version = "1.0.7"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Foldex"; repo = "r2mod_cli"; rev = "v${version}"; - sha256 = "13n2y9gsgb8hnr64y083x9c90j3b4awcmdn81mqmwcydpby3q848"; + sha256 = "sha256-VNqdVDBR6+eNOeUthPXLfz+0VoaNfSj4f04HLvjg6/0="; }; buildInputs = [ bashInteractive ]; From da5310f82e24623655641f39467ee2c560fb4a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 19 May 2021 21:57:35 +0200 Subject: [PATCH 039/101] retroarchBare: use ffmpeg instead of ffmpeg_3 (#123514) --- pkgs/misc/emulators/retroarch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index a6ada570a50..e6f1b4f1a78 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, which, pkg-config, makeWrapper -, ffmpeg_3, libGLU, libGL, freetype, libxml2, python3 +, ffmpeg, libGLU, libGL, freetype, libxml2, python3 , libobjc, AppKit, Foundation , alsaLib ? null , libdrm ? null @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wayland ] ++ optional withVulkan makeWrapper; - buildInputs = [ ffmpeg_3 freetype libxml2 libGLU libGL python3 SDL2 which ] + buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ optional withVulkan vulkan-loader ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] From 6fd00052268062c16f7d986c5f0e9a9fc80c3337 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 May 2021 22:11:18 +0200 Subject: [PATCH 040/101] ipinfo: 1.1.2 -> 1.1.4 --- pkgs/tools/networking/ipinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ipinfo/default.nix b/pkgs/tools/networking/ipinfo/default.nix index 84dc5707cfa..03c54f1ac7d 100644 --- a/pkgs/tools/networking/ipinfo/default.nix +++ b/pkgs/tools/networking/ipinfo/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ipinfo"; - version = "1.1.2"; + version = "1.1.4"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = "${pname}-${version}"; - sha256 = "0hcv0fyrrybasxk2j1la4jmpi161apkg6d4nlsjw6548li6c6a9n"; + sha256 = "1j50bbq7skbh1pffkmrbs1cyz2x22bniwcdw27rjzmvjixs4wj6h"; }; vendorSha256 = null; From 68c618cba3855568e9a3194823354e049635666d Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Wed, 19 May 2021 22:37:49 +0200 Subject: [PATCH 041/101] opensmtpd-filter-rspamd: init at 0.1.7 (#122823) --- nixos/tests/all-tests.nix | 1 + nixos/tests/opensmtpd-rspamd.nix | 142 ++++++++++++++++++ pkgs/servers/mail/opensmtpd/default.nix | 1 + pkgs/servers/mail/opensmtpd/filter-rspamd.nix | 30 ++++ pkgs/top-level/all-packages.nix | 1 + 5 files changed, 175 insertions(+) create mode 100644 nixos/tests/opensmtpd-rspamd.nix create mode 100644 pkgs/servers/mail/opensmtpd/filter-rspamd.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5ff31ba6834..2d96eeacf22 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -303,6 +303,7 @@ in openarena = handleTest ./openarena.nix {}; openldap = handleTest ./openldap.nix {}; opensmtpd = handleTest ./opensmtpd.nix {}; + opensmtpd-rspamd = handleTest ./opensmtpd-rspamd.nix {}; openssh = handleTest ./openssh.nix {}; openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {}; openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; diff --git a/nixos/tests/opensmtpd-rspamd.nix b/nixos/tests/opensmtpd-rspamd.nix new file mode 100644 index 00000000000..9cb2624e6c4 --- /dev/null +++ b/nixos/tests/opensmtpd-rspamd.nix @@ -0,0 +1,142 @@ +import ./make-test-python.nix { + name = "opensmtpd-rspamd"; + + nodes = { + smtp1 = { pkgs, ... }: { + imports = [ common/user-account.nix ]; + networking = { + firewall.allowedTCPPorts = [ 25 143 ]; + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.1"; prefixLength = 24; } + ]; + }; + environment.systemPackages = [ pkgs.opensmtpd ]; + services.opensmtpd = { + enable = true; + extraServerArgs = [ "-v" ]; + serverConfiguration = '' + listen on 0.0.0.0 + action dovecot_deliver mda \ + "${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}" + match from any for local action dovecot_deliver + + action do_relay relay + # DO NOT DO THIS IN PRODUCTION! + # Setting up authentication requires a certificate which is painful in + # a test environment, but THIS WOULD BE DANGEROUS OUTSIDE OF A + # WELL-CONTROLLED ENVIRONMENT! + match from any for any action do_relay + ''; + }; + services.dovecot2 = { + enable = true; + enableImap = true; + mailLocation = "maildir:~/mail"; + protocols = [ "imap" ]; + }; + }; + + smtp2 = { pkgs, ... }: { + imports = [ common/user-account.nix ]; + virtualisation.memorySize = 512; + networking = { + firewall.allowedTCPPorts = [ 25 143 ]; + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.2"; prefixLength = 24; } + ]; + }; + environment.systemPackages = [ pkgs.opensmtpd ]; + services.rspamd = { + enable = true; + locals."worker-normal.inc".text = '' + bind_socket = "127.0.0.1:11333"; + ''; + }; + services.opensmtpd = { + enable = true; + extraServerArgs = [ "-v" ]; + serverConfiguration = '' + filter rspamd proc-exec "${pkgs.opensmtpd-filter-rspamd}/bin/filter-rspamd" + listen on 0.0.0.0 filter rspamd + action dovecot_deliver mda \ + "${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}" + match from any for local action dovecot_deliver + ''; + }; + services.dovecot2 = { + enable = true; + enableImap = true; + mailLocation = "maildir:~/mail"; + protocols = [ "imap" ]; + }; + }; + + client = { pkgs, ... }: { + networking = { + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.3"; prefixLength = 24; } + ]; + }; + environment.systemPackages = let + sendTestMail = pkgs.writeScriptBin "send-a-test-mail" '' + #!${pkgs.python3.interpreter} + import smtplib, sys + + with smtplib.SMTP('192.168.1.1') as smtp: + smtp.sendmail('alice@[192.168.1.1]', 'bob@[192.168.1.2]', """ + From: alice@smtp1 + To: bob@smtp2 + Subject: Test + + Hello World + Here goes the spam test + XJS*C4JDBQADN1.NSBN3*2IDNEN*GTUBE-STANDARD-ANTI-UBE-TEST-EMAIL*C.34X + """) + ''; + + checkMailBounced = pkgs.writeScriptBin "check-mail-bounced" '' + #!${pkgs.python3.interpreter} + import imaplib + + with imaplib.IMAP4('192.168.1.1', 143) as imap: + imap.login('alice', 'foobar') + imap.select() + status, refs = imap.search(None, 'ALL') + assert status == 'OK' + assert len(refs) == 1 + status, msg = imap.fetch(refs[0], 'BODY[TEXT]') + assert status == 'OK' + content = msg[0][1] + print("===> content:", content) + assert b"An error has occurred while attempting to deliver a message" in content + ''; + in [ sendTestMail checkMailBounced ]; + }; + }; + + testScript = '' + start_all() + + client.wait_for_unit("network-online.target") + smtp1.wait_for_unit("opensmtpd") + smtp2.wait_for_unit("opensmtpd") + smtp2.wait_for_unit("rspamd") + smtp2.wait_for_unit("dovecot2") + + # To prevent sporadic failures during daemon startup, make sure + # services are listening on their ports before sending requests + smtp1.wait_for_open_port(25) + smtp2.wait_for_open_port(25) + smtp2.wait_for_open_port(143) + smtp2.wait_for_open_port(11333) + + client.succeed("send-a-test-mail") + smtp1.wait_until_fails("smtpctl show queue | egrep .") + client.succeed("check-mail-bounced >&2") + ''; + + meta.timeout = 1800; +} diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 6a9fc815fd9..72d4ca760e7 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -62,5 +62,6 @@ stdenv.mkDerivation rec { }; passthru.tests = { basic-functionality-and-dovecot-interaction = nixosTests.opensmtpd; + rspamd-integration = nixosTests.opensmtpd-rspamd; }; } diff --git a/pkgs/servers/mail/opensmtpd/filter-rspamd.nix b/pkgs/servers/mail/opensmtpd/filter-rspamd.nix new file mode 100644 index 00000000000..62b01cf9266 --- /dev/null +++ b/pkgs/servers/mail/opensmtpd/filter-rspamd.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nixosTests +}: + +buildGoModule rec { + pname = "opensmtpd-filter-rspamd"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "poolpOrg"; + repo = "filter-rspamd"; + rev = "v${version}"; + sha256 = "pcHj4utpf/AIUv8/7mE8BLbE8LYkzNKfc4T4hIHgGeI="; + }; + + vendorSha256 = "sNF2c+22FMvKoROkA/3KtSnRdJh4YZLaIx35HD896HI="; + + passthru.tests = { + opensmtpd-rspamd-integration = nixosTests.opensmtpd-rspamd; + }; + + meta = with lib; { + homepage = "https://github.com/poolpOrg/filter-rspamd"; + description = "OpenSMTPD filter integration for the Rspamd daemon"; + license = licenses.isc; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39f0ca4478e..c02b0e98e91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19133,6 +19133,7 @@ in opensmtpd = callPackage ../servers/mail/opensmtpd { }; opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { }; + opensmtpd-filter-rspamd = callPackage ../servers/mail/opensmtpd/filter-rspamd.nix { }; openxpki = callPackage ../servers/openxpki { }; From 8e9d803bac9faaa6fcd619ab2131375b7e2be64d Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Wed, 19 May 2021 13:49:27 -0700 Subject: [PATCH 042/101] Fix description for services.kubernetes.addonManager.enable (#71448) `mkEnableOption` already prefixes the description with "Whether to enable" --- nixos/modules/services/cluster/kubernetes/addon-manager.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/cluster/kubernetes/addon-manager.nix b/nixos/modules/services/cluster/kubernetes/addon-manager.nix index f55079300b1..1378b5ccfb7 100644 --- a/nixos/modules/services/cluster/kubernetes/addon-manager.nix +++ b/nixos/modules/services/cluster/kubernetes/addon-manager.nix @@ -62,7 +62,7 @@ in ''; }; - enable = mkEnableOption "Whether to enable Kubernetes addon manager."; + enable = mkEnableOption "Kubernetes addon manager."; }; ###### implementation From 27056f591da5bdb44f2926ee187c56473256516b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 19 May 2021 23:02:01 +0200 Subject: [PATCH 043/101] python3Packages.aioshelly: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/aioshelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index aa5e227ca65..05b4794a826 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-vlIon+VAHeJiaSIVMEKEpwQC4gXA52vxfEkiQMC9yiw="; + sha256 = "sha256-c4EFR7rcYdrCdM0AfmX/d7cP4woh6P1iAjeSQV9ieKM="; }; propagatedBuildInputs = [ From 274a71f262bd50cbbbabe484e2430fb2c8480431 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 19 May 2021 09:48:36 -0700 Subject: [PATCH 044/101] solc: make darwin friendly --- pkgs/development/compilers/solc/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index c8f0c50d8a5..c01cc761e8c 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -7,7 +7,7 @@ , python3 , z3Support ? true , z3 ? null -, cvc4Support ? true +, cvc4Support ? gccStdenv.isLinux , cvc4 ? null , cln ? null , gmp ? null @@ -98,7 +98,6 @@ let description = "Compiler for Ethereum smart contract language Solidity"; homepage = "https://github.com/ethereum/solidity"; license = licenses.gpl3; - platforms = with platforms; linux; # darwin is currently broken maintainers = with maintainers; [ dbrock akru lionello sifmelcara ]; inherit version; }; From 3f3cec6d9e0ea459823ddc557b9a99f4ef2c5b95 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 18 May 2021 12:04:37 +0200 Subject: [PATCH 045/101] clickhouse: 20.11.4.13-stable -> 21.3.11.5-lts Failing Hydra build: https://hydra.nixos.org/build/143269865 ZHF #122042 --- .../modules/services/databases/clickhouse.nix | 1 + nixos/tests/clickhouse.nix | 1 + pkgs/servers/clickhouse/default.nix | 19 ++++--------------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix index 27440fec4e1..f2f4e9d2554 100644 --- a/nixos/modules/services/databases/clickhouse.nix +++ b/nixos/modules/services/databases/clickhouse.nix @@ -42,6 +42,7 @@ with lib; User = "clickhouse"; Group = "clickhouse"; ConfigurationDirectory = "clickhouse-server"; + AmbientCapabilities = "CAP_SYS_NICE"; StateDirectory = "clickhouse"; LogsDirectory = "clickhouse"; ExecStart = "${pkgs.clickhouse}/bin/clickhouse-server --config-file=${pkgs.clickhouse}/etc/clickhouse-server/config.xml"; diff --git a/nixos/tests/clickhouse.nix b/nixos/tests/clickhouse.nix index 98d8b4b4652..017f2ee35da 100644 --- a/nixos/tests/clickhouse.nix +++ b/nixos/tests/clickhouse.nix @@ -4,6 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine = { services.clickhouse.enable = true; + virtualisation.memorySize = 4096; }; testScript = diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 087f9628505..51d091f0ad3 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, libtool, lldClang, ninja +{ lib, stdenv, fetchFromGitHub, cmake, libtool, lldClang, ninja , boost, brotli, capnproto, cctz, clang-unwrapped, double-conversion , icu, jemalloc, libcpuid, libxml2, lld, llvm, lz4, libmysqlclient, openssl, perl , poco, protobuf, python3, rapidjson, re2, rdkafka, readline, sparsehash, unixODBC @@ -7,16 +7,16 @@ stdenv.mkDerivation rec { pname = "clickhouse"; - version = "20.11.4.13"; + version = "21.3.11.5"; broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685 src = fetchFromGitHub { owner = "ClickHouse"; repo = "ClickHouse"; - rev = "v${version}-stable"; + rev = "v${version}-lts"; fetchSubmodules = true; - sha256 = "0c87k0xqwj9sc3xy2f3ngfszgjiz4rzd787bdg6fxp94w1adjhny"; + sha256 = "sha256-V62Z82p21qtvSOsoXM225/Wkc9F+dvVMz0xpVjhgZVo="; }; nativeBuildInputs = [ cmake libtool lldClang.bintools ninja ]; @@ -27,20 +27,9 @@ stdenv.mkDerivation rec { xxHash zstd ]; - patches = [ - # This patch is only required for 20.11.4.13 - it should be included in the - # next stable release from upstream by default - (fetchpatch { - url = "https://github.com/ClickHouse/ClickHouse/commit/e31753b4db7aa0a72a85757dc11fc403962e30db.patch"; - sha256 = "12ax02dh9y9k8smkj6v50yfr46iprscbrvd4bb9vfbx8xqgw7grb"; - }) - ]; - postPatch = '' patchShebangs src/ - substituteInPlace contrib/openssl-cmake/CMakeLists.txt \ - --replace '/usr/bin/env perl' perl substituteInPlace src/Storages/System/StorageSystemLicenses.sh \ --replace 'git rev-parse --show-toplevel' '$src' substituteInPlace utils/check-style/check-duplicate-includes.sh \ From 13484444d4b136b287149a9bce974cb67f977fbc Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Sun, 9 May 2021 00:55:23 +0200 Subject: [PATCH 046/101] ghc-filesystem: init at 1.5.4 --- .../libraries/ghc_filesystem/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/ghc_filesystem/default.nix diff --git a/pkgs/development/libraries/ghc_filesystem/default.nix b/pkgs/development/libraries/ghc_filesystem/default.nix new file mode 100644 index 00000000000..76cfc4fbce6 --- /dev/null +++ b/pkgs/development/libraries/ghc_filesystem/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, cmake, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "filesystem"; + version = "1.5.4"; + + src = fetchFromGitHub { + owner = "gulrak"; + repo = "filesystem"; + rev = "v${version}"; + hash = "sha256-SvNUzKoNiSIM0no+A0NUT6hmeUH9SzgLQLrC5XOC0Ho="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "header-only single-file C++ std::filesystem compatible helper library"; + homepage = "https://github.com/gulrak/filesystem"; + license = licenses.mit; + maintainers = with maintainers; [ lourkeur ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c02b0e98e91..06ad7aea9f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14745,6 +14745,8 @@ in givaro_3 = callPackage ../development/libraries/givaro/3.nix {}; givaro_3_7 = callPackage ../development/libraries/givaro/3.7.nix {}; + ghc_filesystem = callPackage ../development/libraries/ghc_filesystem {}; + ghp-import = with python3Packages; toPythonApplication ghp-import; ghcid = haskellPackages.ghcid.bin; From bdad35184221b0638fdc0228628209dde390399e Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Mon, 10 May 2021 16:48:00 +0200 Subject: [PATCH 047/101] maintainers: add chia team --- maintainers/team-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 39329e582d7..0e2baa9e758 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -48,6 +48,14 @@ with lib.maintainers; { scope = "Maintain Cinnamon desktop environment and applications made by the LinuxMint team."; }; + chia = { + members = [ + atemu + lourkeur + ]; + scope = "Maintain the Chia blockchain and its dependencies"; + }; + deshaw = { # Verify additions to this team with at least one already existing member of the team. members = [ From a8d87bf2e32a11cf9656138b24220821bb60d82c Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Sun, 9 May 2021 00:56:08 +0200 Subject: [PATCH 048/101] pythonPackages.chiapos: init at 1.0.1 --- .../python-modules/chiapos/default.nix | 48 +++++++++++++++++++ .../chiapos/dont_fetch_dependencies.patch | 31 ++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 81 insertions(+) create mode 100644 pkgs/development/python-modules/chiapos/default.nix create mode 100644 pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix new file mode 100644 index 00000000000..1faf5a94f8c --- /dev/null +++ b/pkgs/development/python-modules/chiapos/default.nix @@ -0,0 +1,48 @@ +{ lib +, substituteAll +, buildPythonPackage +, fetchPypi +, cmake +, cxxopts +, ghc_filesystem +, pybind11 +, pythonOlder +, psutil +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "chiapos"; + version = "1.0.1"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-kJx57EtwPBrGMpjnSzeYYhWqc/g1N1Bg8slW5oZKjg8="; + }; + + patches = [ + # prevent CMake from trying to get libraries on the Internet + (substituteAll { + src = ./dont_fetch_dependencies.patch; + inherit cxxopts ghc_filesystem; + pybind11_src = pybind11.src; + }) + ]; + + nativeBuildInputs = [ cmake setuptools-scm ]; + + buildInputs = [ pybind11 ]; + + checkInputs = [ psutil ]; + + # CMake needs to be run by setuptools rather than by its hook + dontConfigure = true; + + meta = with lib; { + description = "Chia proof of space library"; + homepage = "https://www.chia.net/"; + license = licenses.asl20; + maintainers = teams.chia.members; + }; +} diff --git a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch new file mode 100644 index 00000000000..ca18fd292ca --- /dev/null +++ b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9b4a2f5..86f849c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,22 +18,19 @@ include(FetchContent) + + FetchContent_Declare( + pybind11-src +- GIT_REPOSITORY https://github.com/pybind/pybind11.git +- GIT_TAG v2.6.2 ++ SOURCE_DIR @pybind11_src@ + ) + FetchContent_MakeAvailable(pybind11-src) + + FetchContent_Declare( + cxxopts +- GIT_REPOSITORY https://github.com/jarro2783/cxxopts.git +- GIT_TAG v2.2.1 ++ SOURCE_DIR @cxxopts@ + ) + FetchContent_MakeAvailable(cxxopts) + + FetchContent_Declare( + gulrak +- GIT_REPOSITORY https://github.com/gulrak/filesystem.git +- GIT_TAG v1.5.4 ++ SOURCE_DIR @ghc_filesystem@ + ) + FetchContent_MakeAvailable(gulrak) + + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7bd3aa5da99..e61249e7257 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1345,6 +1345,8 @@ in { chevron = callPackage ../development/python-modules/chevron { }; + chiapos = callPackage ../development/python-modules/chiapos { }; + chirpstack-api = callPackage ../development/python-modules/chirpstack-api { }; ci-info = callPackage ../development/python-modules/ci-info { }; From cef1166a10a3aa69152173ba6c110acd39ead47d Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Sun, 9 May 2021 10:08:39 +0200 Subject: [PATCH 049/101] pythonPackages.chiavdf: init at 1.0.1 --- .../python-modules/chiavdf/default.nix | 53 +++++++++++++++++++ .../chiavdf/dont_fetch_dependencies.patch | 14 +++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 69 insertions(+) create mode 100644 pkgs/development/python-modules/chiavdf/default.nix create mode 100644 pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch diff --git a/pkgs/development/python-modules/chiavdf/default.nix b/pkgs/development/python-modules/chiavdf/default.nix new file mode 100644 index 00000000000..deb7d21adc7 --- /dev/null +++ b/pkgs/development/python-modules/chiavdf/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, setuptools-scm +, substituteAll +, cmake +, boost +, gmp +, pybind11 +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "chiavdf"; + version = "1.0.1"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-z0od/VrH580+9641lKNI7jbVMlJZKCWnoT+GljnFxmU="; + }; + + patches = [ + # prevent CMake from trying to get libraries on the Internet + (substituteAll { + src = ./dont_fetch_dependencies.patch; + pybind11_src = pybind11.src; + }) + ]; + + # x86 instructions are needed for this component + BUILD_VDF_CLIENT = lib.optionalString (!stdenv.isx86_64) "N"; + + nativeBuildInputs = [ cmake setuptools-scm ]; + + buildInputs = [ boost gmp pybind11 ]; + + checkInputs = [ + pytestCheckHook + ]; + + # CMake needs to be run by setuptools rather than by its hook + dontConfigure = true; + + meta = with lib; { + description = "Chia verifiable delay function utilities"; + homepage = "https://www.chia.net/"; + license = licenses.asl20; + maintainers = teams.chia.members; + }; +} diff --git a/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch new file mode 100644 index 00000000000..9b49db81fcf --- /dev/null +++ b/pkgs/development/python-modules/chiavdf/dont_fetch_dependencies.patch @@ -0,0 +1,14 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c975128..a9f6910 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -31,8 +31,7 @@ include(FetchContent) + + FetchContent_Declare( + pybind11-src +- GIT_REPOSITORY https://github.com/pybind/pybind11.git +- GIT_TAG v2.6.2 ++ SOURCE_DIR @pybind11_src@ + ) + FetchContent_MakeAvailable(pybind11-src) + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e61249e7257..25bc1d8eeea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1347,6 +1347,8 @@ in { chiapos = callPackage ../development/python-modules/chiapos { }; + chiavdf = callPackage ../development/python-modules/chiavdf { }; + chirpstack-api = callPackage ../development/python-modules/chirpstack-api { }; ci-info = callPackage ../development/python-modules/ci-info { }; From 19b3863ba70a2b17d176b271b1342751835f880a Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Sun, 9 May 2021 11:12:20 +0200 Subject: [PATCH 050/101] pythonPackages.chiabip158: init at 1.0 --- .../python-modules/chiabip158/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/chiabip158/default.nix diff --git a/pkgs/development/python-modules/chiabip158/default.nix b/pkgs/development/python-modules/chiabip158/default.nix new file mode 100644 index 00000000000..f2c30959361 --- /dev/null +++ b/pkgs/development/python-modules/chiabip158/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cmake +, pybind11 +, pythonOlder +, pytestCheckHook +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "chiabip158"; + version = "1.0"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-dG6A4n30uPswQWY/Wmi75HK4ZMCDNr9Lt05FRWEPYV8="; + }; + + nativeBuildInputs = [ cmake setuptools-scm ]; + + buildInputs = [ pybind11 ]; + + checkInputs = [ + pytestCheckHook + ]; + + # CMake needs to be run by setuptools rather than by its hook + dontConfigure = true; + + meta = with lib; { + description = "Chia's implementation of BIP 158"; + homepage = "https://www.chia.net/"; + license = licenses.asl20; + maintainers = teams.chia.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 25bc1d8eeea..a5dfeb10118 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1345,6 +1345,8 @@ in { chevron = callPackage ../development/python-modules/chevron { }; + chiabip158 = callPackage ../development/python-modules/chiabip158 { }; + chiapos = callPackage ../development/python-modules/chiapos { }; chiavdf = callPackage ../development/python-modules/chiavdf { }; From d4fdd9a19cf149ea4009bb344f4100930ad39ff1 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Sun, 9 May 2021 16:01:13 +0200 Subject: [PATCH 051/101] pythonPackages.keyrings-cryptfile: init at 1.3.4 --- .../keyrings-cryptfile/default.nix | 59 +++++++++++++++++++ .../keyrings-cryptfile/fix-testsuite.patch | 14 +++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 75 insertions(+) create mode 100644 pkgs/development/python-modules/keyrings-cryptfile/default.nix create mode 100644 pkgs/development/python-modules/keyrings-cryptfile/fix-testsuite.patch diff --git a/pkgs/development/python-modules/keyrings-cryptfile/default.nix b/pkgs/development/python-modules/keyrings-cryptfile/default.nix new file mode 100644 index 00000000000..7f2cacea629 --- /dev/null +++ b/pkgs/development/python-modules/keyrings-cryptfile/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, argon2_cffi +, keyring +, pycryptodome +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "keyrings.cryptfile"; + # NOTE: newer releases are bugged/incompatible + # https://github.com/frispete/keyrings.cryptfile/issues/15 + version = "1.3.4"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-jW+cKMm+xef8C+fl0CGe+6SEkYBHDjFX2/kLCZ62j6c="; + }; + + patches = [ + # upstream setup.cfg has an option that is not supported + ./fix-testsuite.patch + # change of API in keyrings.testing + (fetchpatch { + url = "https://github.com/frispete/keyrings.cryptfile/commit/6fb9e45f559b8b69f7a0a519c0bece6324471d79.patch"; + sha256 = "sha256-1878pMO9Ed1zs1pl+7gMjwx77HbDHdE1CryN8TPfPdU="; + }) + ]; + + propagatedBuildInputs = [ + argon2_cffi + keyring + pycryptodome + ]; + + pythonImportsCheck = [ + "keyrings.cryptfile" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + "test_set_properties" + "UncryptedFileKeyringTestCase" + ]; + + meta = with lib; { + description = "Encrypted file keyring backend"; + homepage = "https://github.com/frispete/keyrings.cryptfile"; + license = licenses.mit; + maintainers = teams.chia.members; + }; +} diff --git a/pkgs/development/python-modules/keyrings-cryptfile/fix-testsuite.patch b/pkgs/development/python-modules/keyrings-cryptfile/fix-testsuite.patch new file mode 100644 index 00000000000..8e32a64e529 --- /dev/null +++ b/pkgs/development/python-modules/keyrings-cryptfile/fix-testsuite.patch @@ -0,0 +1,14 @@ +diff --git a/setup.cfg b/setup.cfg +index ec7eb30..7ffd831 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -5,9 +5,6 @@ dists = clean --all sdist bdist_wheel + [wheel] + universal = 1 + +-[tool:pytest] +-addopts = -s --cov=keyrings/cryptfile +- + [egg_info] + tag_build = + tag_date = 0 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a5dfeb10118..79779fa9f1d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3661,6 +3661,8 @@ in { keyring = callPackage ../development/python-modules/keyring { }; + keyrings-cryptfile = callPackage ../development/python-modules/keyrings-cryptfile { }; + keyrings-alt = callPackage ../development/python-modules/keyrings-alt { }; keystone-engine = callPackage ../development/python-modules/keystone-engine { }; From ffdf830cdde81cde4b4c2b72bd344dc2e57a7680 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Sun, 9 May 2021 16:30:13 +0200 Subject: [PATCH 052/101] pythonPackages.blspy: init at 1.0.2 --- .../python-modules/blspy/default.nix | 58 +++++++++++++++++++ .../blspy/dont_fetch_dependencies.patch | 38 ++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 98 insertions(+) create mode 100644 pkgs/development/python-modules/blspy/default.nix create mode 100644 pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch diff --git a/pkgs/development/python-modules/blspy/default.nix b/pkgs/development/python-modules/blspy/default.nix new file mode 100644 index 00000000000..e75e474bdab --- /dev/null +++ b/pkgs/development/python-modules/blspy/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchFromGitHub +, setuptools-scm +, substituteAll +, cmake +, boost +, gmp +, pybind11 +, pythonOlder +}: + +buildPythonPackage rec { + pname = "blspy"; + version = "1.0.2"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-N1mk83uZrzSty2DyXfKiVp85z/jmztiUSRXKfNBRJV4="; + }; + + patches = [ + # prevent CMake from trying to get libraries on the Internet + (substituteAll { + src = ./dont_fetch_dependencies.patch; + pybind11_src = pybind11.src; + relic_src = fetchFromGitHub { + owner = "relic-toolkit"; + repo = "relic"; + rev = "1885ae3b681c423c72b65ce1fe70910142cf941c"; # pinned by blspy + hash = "sha256-tsSZTcssl8t7Nqdex4BesgQ+ACPgTdtHnJFvS9josN0="; + }; + }) + ]; + + nativeBuildInputs = [ cmake setuptools-scm ]; + + buildInputs = [ boost gmp.static pybind11 ]; + + pythonImportsCheck = [ + "blspy" + ]; + + # Note: upstream testsuite is just a single test.py script outside of any framework + doCheck = false; + + # CMake needs to be run by setuptools rather than by its hook + dontConfigure = true; + + meta = with lib; { + description = "BLS signatures with aggregation"; + homepage = "https://github.com/Chia-Network/bls-signatures/"; + license = licenses.asl20; + maintainers = teams.chia.members; + }; +} diff --git a/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch new file mode 100644 index 00000000000..f9c41d9420b --- /dev/null +++ b/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch @@ -0,0 +1,38 @@ +diff --git a/python-bindings/CMakeLists.txt b/python-bindings/CMakeLists.txt +index 255e3bb..5f99c3a 100644 +--- a/python-bindings/CMakeLists.txt ++++ b/python-bindings/CMakeLists.txt +@@ -6,8 +6,7 @@ include(FetchContent) + + FetchContent_Declare( + pybind11 +- GIT_REPOSITORY https://github.com/pybind/pybind11.git +- GIT_TAG v2.6.2 ++ SOURCE_DIR @pybind11_src@ + ) + FetchContent_MakeAvailable(pybind11 relic) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index faecc61..3272116 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -4,18 +4,9 @@ set (CMAKE_CXX_STANDARD 17) + # CMake 3.14+ + include(FetchContent) + +-if (DEFINED ENV{RELIC_MAIN}) +- set(RELIC_GIT_TAG "origin/main") +-else () +- set(RELIC_GIT_TAG "1885ae3b681c423c72b65ce1fe70910142cf941c") +-endif () +- +-message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}") +- + FetchContent_Declare( + relic +- GIT_REPOSITORY https://github.com/relic-toolkit/relic.git +- GIT_TAG ${RELIC_GIT_TAG} ++ SOURCE_DIR @relic_src@ + ) + FetchContent_MakeAvailable(relic) + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79779fa9f1d..9425a787129 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1091,6 +1091,8 @@ in { block-io = callPackage ../development/python-modules/block-io { }; + blspy = callPackage ../development/python-modules/blspy { }; + bluepy = callPackage ../development/python-modules/bluepy { }; bluepy-devices = callPackage ../development/python-modules/bluepy-devices { }; From 07841681efa5196c61d720c4538f4567a7c6bbb1 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Mon, 10 May 2021 14:50:24 +0200 Subject: [PATCH 053/101] pythonPackages.clvm-rs: init at 0.1.7 --- .../python-modules/clvm-rs/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/clvm-rs/default.nix diff --git a/pkgs/development/python-modules/clvm-rs/default.nix b/pkgs/development/python-modules/clvm-rs/default.nix new file mode 100644 index 00000000000..4e5f69f8cd5 --- /dev/null +++ b/pkgs/development/python-modules/clvm-rs/default.nix @@ -0,0 +1,47 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, rustPlatform +, pythonOlder +, openssl +, perl +}: + +buildPythonPackage rec { + pname = "clvm_rs"; + version = "0.1.7"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Chia-Network"; + repo = "clvm_rs"; + rev = version; + sha256 = "sha256-ves23q1uQ3lexwK9l1xGRss05jYObJDi/aY9Yvp4aPU="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-3kPzM2EX61ZvU6VKXY1OG/ic+9FU3Et4RuKp+3QYzSo="; + }; + + format = "pyproject"; + + nativeBuildInputs = [ + perl # used by openssl-sys to configure + ] ++ (with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]); + + buildInputs = [ openssl ]; + + pythonImportsCheck = [ "clvm_rs" ]; + + meta = with lib; { + homepage = "https://chialisp.com/"; + description = "Rust implementation of clvm"; + license = licenses.asl20; + maintainers = teams.chia.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9425a787129..ff938c474c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1447,6 +1447,8 @@ in { clustershell = callPackage ../development/python-modules/clustershell { }; + clvm-rs = callPackage ../development/python-modules/clvm-rs { }; + cma = callPackage ../development/python-modules/cma { }; cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; From fe3f4115fc3492196c074769f79648266cc478fa Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Mon, 10 May 2021 17:18:11 +0200 Subject: [PATCH 054/101] pythonPackages.clvm: init at 0.9.6 --- .../python-modules/clvm/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/clvm/default.nix diff --git a/pkgs/development/python-modules/clvm/default.nix b/pkgs/development/python-modules/clvm/default.nix new file mode 100644 index 00000000000..f7168832fa4 --- /dev/null +++ b/pkgs/development/python-modules/clvm/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, blspy +, setuptools-scm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "clvm"; + version = "0.9.6"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Chia-Network"; + repo = "clvm"; + rev = version; + sha256 = "sha256-XBQEilDFhx0kT9bEMD4jX+SDk3cAC1BUCWhbtpgrLcA="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + # give a hint to setuptools_scm on package version + SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; + + propagatedBuildInputs = [ + blspy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # all tests in this file have a circular dependency on clvm-tools + "tests/cmds_test.py" + ]; + + pythonImportsCheck = [ + "clvm" + ]; + + meta = with lib; { + description = "Chia Lisp virtual machine"; + homepage = "https://www.chia.net/"; + license = licenses.asl20; + maintainers = teams.chia.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff938c474c7..192e96f2e6c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1447,6 +1447,8 @@ in { clustershell = callPackage ../development/python-modules/clustershell { }; + clvm = callPackage ../development/python-modules/clvm { }; + clvm-rs = callPackage ../development/python-modules/clvm-rs { }; cma = callPackage ../development/python-modules/cma { }; From 134b5f5af8fa65cf547832bd34007e2d45343f34 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Mon, 10 May 2021 17:44:43 +0200 Subject: [PATCH 055/101] pythonPackages.clvm-tools: init at 0.4.3 --- .../python-modules/clvm-tools/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/clvm-tools/default.nix diff --git a/pkgs/development/python-modules/clvm-tools/default.nix b/pkgs/development/python-modules/clvm-tools/default.nix new file mode 100644 index 00000000000..365f21e8c36 --- /dev/null +++ b/pkgs/development/python-modules/clvm-tools/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, clvm +, setuptools-scm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "clvm_tools"; + version = "0.4.3"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Chia-Network"; + repo = "clvm_tools"; + rev = version; + sha256 = "sha256-bWz3YCrakob/kROq+LOA+yD1wtIbInVrmDqtg4/cV4g="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + clvm + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "clvm_tools" + ]; + + disabledTests = [ + "test_cmd_unknown-1_txt" + ]; + + # give a hint to setuptools_scm on package version + SETUPTOOLS_SCM_PRETEND_VERSION="v${version}"; + + meta = with lib; { + description = "Tools for clvm development"; + homepage = "https://www.chialisp.com/"; + license = licenses.asl20; + maintainers = teams.chia.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 192e96f2e6c..f28cf961219 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1451,6 +1451,8 @@ in { clvm-rs = callPackage ../development/python-modules/clvm-rs { }; + clvm-tools = callPackage ../development/python-modules/clvm-tools { }; + cma = callPackage ../development/python-modules/cma { }; cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; From 74365e4ff1a13e9ba95ab4524db8925334facaa4 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Mon, 10 May 2021 17:45:47 +0200 Subject: [PATCH 056/101] pythonPackages.concurrent-log-handler: init at 0.9.19 --- .../concurrent-log-handler/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/concurrent-log-handler/default.nix diff --git a/pkgs/development/python-modules/concurrent-log-handler/default.nix b/pkgs/development/python-modules/concurrent-log-handler/default.nix new file mode 100644 index 00000000000..5880cdf961e --- /dev/null +++ b/pkgs/development/python-modules/concurrent-log-handler/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, portalocker +}: + +buildPythonPackage rec { + pname = "concurrent-log-handler"; + version = "0.9.19"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-sS95q+0/lBIcJc6cJM21fYiSguxv9h9VNasgaNw31Ak="; + }; + + propagatedBuildInputs = [ + portalocker + ]; + + pythonImportsCheck = [ + "concurrent_log_handler" + ]; + + doCheck = false; # upstream has no tests + + meta = with lib; { + description = "Python logging handler that allows multiple processes to safely write to the same log file concurrently"; + homepage = "https://www.chia.net/"; + license = licenses.asl20; + maintainers = teams.chia.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f28cf961219..6db0f528b1f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1519,6 +1519,8 @@ in { compiledb = callPackage ../development/python-modules/compiledb { }; + concurrent-log-handler = callPackage ../development/python-modules/concurrent-log-handler { }; + conda = callPackage ../development/python-modules/conda { }; ConfigArgParse = self.configargparse; # added 2021-03-18 From e9bfad8f6af1841b6cc865fe70c4e673b8d474b9 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Sun, 9 May 2021 12:26:25 +0200 Subject: [PATCH 057/101] chia: init at 1.1.5 --- .../applications/blockchains/chia/default.nix | 69 +++++++++++++++++++ .../blockchains/chia/dependencies.patch | 13 ++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 84 insertions(+) create mode 100644 pkgs/applications/blockchains/chia/default.nix create mode 100644 pkgs/applications/blockchains/chia/dependencies.patch diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix new file mode 100644 index 00000000000..0c4220b72ba --- /dev/null +++ b/pkgs/applications/blockchains/chia/default.nix @@ -0,0 +1,69 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "chia"; + version = "1.1.5"; + + src = fetchFromGitHub { + owner = "Chia-Network"; + repo = "chia-blockchain"; + rev = version; + sha256 = "ZUxWOlJGQpeQCtWt0PSdcbMackHdeuNFkxHvYDPcU8Y="; + }; + + patches = [ + # tweak version requirements to what's available in Nixpkgs + ./dependencies.patch + ]; + + nativeBuildInputs = [ + python3Packages.setuptools-scm + ]; + + # give a hint to setuptools_scm on package version + SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; + + propagatedBuildInputs = with python3Packages; [ + aiohttp + aiosqlite + bitstring + blspy + chiapos + chiavdf + chiabip158 + click + clvm + clvm-rs + clvm-tools + colorlog + concurrent-log-handler + cryptography + keyrings-cryptfile + pyyaml + setproctitle + setuptools # needs pkg_resources at runtime + sortedcontainers + websockets + ]; + + checkInputs = [ + python3Packages.pytestCheckHook + ]; + + disabledTests = [ + "test_spend_through_n" + "test_spend_zero_coin" + ]; + + preCheck = '' + export HOME=`mktemp -d` + ''; + + meta = with lib; { + homepage = "https://www.chia.net/"; + description = "Chia is a modern cryptocurrency built from scratch, designed to be efficient, decentralized, and secure."; + license = with licenses; [ asl20 ]; + maintainers = teams.chia.members; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/blockchains/chia/dependencies.patch b/pkgs/applications/blockchains/chia/dependencies.patch new file mode 100644 index 00000000000..d9575d1d392 --- /dev/null +++ b/pkgs/applications/blockchains/chia/dependencies.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index c5cf95db..b783a9e6 100644 +--- a/setup.py ++++ b/setup.py +@@ -8,7 +8,7 @@ dependencies = [ + "clvm==0.9.6", + "clvm_rs==0.1.7", + "clvm_tools==0.4.3", +- "aiohttp==3.7.4", # HTTP server for full node rpc ++ "aiohttp==3.7.4.post0", # HTTP server for full node rpc + "aiosqlite==0.17.0", # asyncio wrapper for sqlite, to store blocks + "bitstring==3.1.7", # Binary data management library + "colorlog==5.0.1", # Adds color to logs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06ad7aea9f8..725056d4140 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27649,6 +27649,8 @@ in cgminer = callPackage ../applications/blockchains/cgminer { }; + chia = callPackage ../applications/blockchains/chia { }; + clightning = callPackage ../applications/blockchains/clightning.nix { }; bitcoin-abc = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc.nix { boost = boost165; withGui = true; }; From f6d57e237a3df8acb9c1d334f9c6fe4fdcf767c3 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Wed, 19 May 2021 23:29:03 +0200 Subject: [PATCH 058/101] terraform_0_15: 0.15.3 -> 0.15.4 --- pkgs/applications/networking/cluster/terraform/default.nix | 6 +++--- .../networking/cluster/terraform/provider-path-0_15.patch | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 3b55c99b263..2a4f10a8f11 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -164,9 +164,9 @@ in rec { }); terraform_0_15 = pluggable (generic { - version = "0.15.3"; - sha256 = "12dny8f89ry75ljarhdqlwgzv6py75s1wcmb62n5fp9nk03bjf2p"; - vendorSha256 = "13ap1arn81lcxry08j42ck6lgvdcvdxgah6d40pmpkzkw9jcf55b"; + version = "0.15.4"; + sha256 = "14pxnmxy0c7idn8vgns70fxm2835gbz5vd1hmwzvhm394vr62frp"; + vendorSha256 = "12hrpxay6k3kz89ihyhl91c4lw4wp821ppa245w9977fq09fhnx0"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch b/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch index 1896d6018f0..318df9ab69a 100644 --- a/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch +++ b/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch @@ -1,6 +1,6 @@ -diff -Naur terraform.old/command/init.go terraform.new/command/init.go ---- terraform.old/command/init.go -+++ terraform.new/command/init.go +diff -Naur terraform.old/internal/command/init.go terraform.new/internal/command/init.go +--- terraform.old/internal/command/init.go ++++ terraform.new/internal/command/init.go @@ -3,6 +3,7 @@ import ( "context" From d2f2e638a9462c56360c890efea2dfceb958efee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 19 May 2021 23:35:43 +0200 Subject: [PATCH 059/101] openjfx11: use ffmpeg instead of ffmpeg_3 (#123500) --- pkgs/development/compilers/openjdk/openjfx/11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 8688831cdaa..306130a0991 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, writeText, gradleGen, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg_3, python, ruby +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby , openjdk11-bootstrap }: let @@ -19,7 +19,7 @@ let sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ]; dontUseCmakeConfigure = true; From a20dd346002e3ae932762d5e7f6ccbf6cc080f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 19 May 2021 23:45:41 +0200 Subject: [PATCH 060/101] ffmpeg_3: mark as insecure (#123496) --- pkgs/development/libraries/ffmpeg/3.4.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index a5140fa01ca..25c0a12f731 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -9,4 +9,7 @@ callPackage ./generic.nix (rec { branch = "3.4.8"; sha256 = "1d0r4yja2dkkyhdwx1migq46gsrcbajiv66263a5sq5bfr9dqkch"; darwinFrameworks = [ Cocoa CoreMedia ]; + knownVulnerabilities = [ + "CVE-2021-30123" + ]; } // args) From f06e539ef4441fa9bdd490447874b244600ddc52 Mon Sep 17 00:00:00 2001 From: lunik1 <13547699+lunik1@users.noreply.github.com> Date: Wed, 19 May 2021 22:48:45 +0100 Subject: [PATCH 061/101] megacmd: temporarily remove ffmpeg dependency (#123711) Build fails against ffmpeg 4.4, and ffmpeg_3 is to be marked insecure. --- pkgs/applications/misc/megacmd/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 95b4838e3e7..9a8d26cc70e 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -6,7 +6,9 @@ , cryptopp , curl , fetchFromGitHub -, ffmpeg_3 # build fails with latest ffmpeg, see https://github.com/meganz/MEGAcmd/issues/523 + # build fails with latest ffmpeg, see https://github.com/meganz/MEGAcmd/issues/523. + # to be re-enabled when patch available + # , ffmpeg , freeimage , gcc-unwrapped , libmediainfo @@ -44,7 +46,7 @@ stdenv.mkDerivation rec { c-ares cryptopp curl - ffmpeg_3 + # ffmpeg freeimage gcc-unwrapped libmediainfo @@ -67,7 +69,7 @@ stdenv.mkDerivation rec { "--with-cares" "--with-cryptopp" "--with-curl" - "--with-ffmpeg" + # "--with-ffmpeg" "--with-freeimage" "--with-libmediainfo" "--with-libuv" From 62415602363ba9d5772b1cc86e7e96599b1a9915 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 19 May 2021 23:01:51 +0100 Subject: [PATCH 062/101] python3Packages.hdbscan: disable flaky tests --- pkgs/development/python-modules/hdbscan/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 269062a1e71..5264ff24890 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -35,6 +35,12 @@ buildPythonPackage rec { rm __init__.py ''; checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # known flaky tests: https://github.com/scikit-learn-contrib/hdbscan/issues/420 + "test_mem_vec_diff_clusters" + "test_all_points_mem_vec_diff_clusters" + "test_approx_predict_diff_clusters" + ]; meta = with lib; { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; From 0ef5ecddd38a0711c3cb6f8470ededc71fbf6e43 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 20 May 2021 00:10:13 +0100 Subject: [PATCH 063/101] python3Packages.nassl: fix build was broken when #119825 fixed openssl.bin's /bin location --- pkgs/development/python-modules/nassl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/nassl/default.nix b/pkgs/development/python-modules/nassl/default.nix index 8a290a7b859..97033224c14 100644 --- a/pkgs/development/python-modules/nassl/default.nix +++ b/pkgs/development/python-modules/nassl/default.nix @@ -90,7 +90,7 @@ buildPythonPackage rec { ${opensslLegacyStatic.out}/lib/libcrypto.a \ deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include - ln -s ${opensslLegacyStatic.bin} deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps + ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/ cp ${opensslStatic.out}/lib/libssl.a \ From 4e0014145c9f28f09fae92df962e2a0d830813b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 May 2021 17:49:15 +0200 Subject: [PATCH 064/101] python3Packages.ytmusicapi: 0.16.0 -> 0.17.1 https://github.com/sigma67/ytmusicapi/releases/tag/0.17.0 https://github.com/sigma67/ytmusicapi/releases/tag/0.17.1 --- pkgs/development/python-modules/ytmusicapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 4728da51a64..9c92e5e55a6 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.16.0"; + version = "0.17.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-/94/taeBI6xZ3uN/wfMnk/NPmk+j0+aaH8CAZBEsK10="; + sha256 = "sha256-b5+AGf9qFqQbx4Rq4RovK2NllYsB+sXVMFU4AvbDkzI="; }; propagatedBuildInputs = [ From b84ce9991c728d206c1b82ff52a0bcd0426d7f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 May 2021 17:55:08 +0200 Subject: [PATCH 065/101] spotdl: disable tests They require networking after the last ytmusicapi update. --- pkgs/tools/audio/spotdl/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index 80480c91ca9..9306c516af5 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -35,6 +35,9 @@ python3.pkgs.buildPythonApplication rec { pytest-subprocess ]; + # requires networking + doCheck = false; + makeWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath [ ffmpeg ]) ]; From 3b56b0d384b5c7a07118326d1c8821c1454a5b7b Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 19 May 2021 18:42:58 -0400 Subject: [PATCH 066/101] python3Packages.cirq-core: init at 0.11.0 --- .../python-modules/cirq-core/default.nix | 98 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 100 insertions(+) create mode 100644 pkgs/development/python-modules/cirq-core/default.nix diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix new file mode 100644 index 00000000000..54e2fa1954d --- /dev/null +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -0,0 +1,98 @@ +{ stdenv +, lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, matplotlib +, networkx +, numpy +, pandas +, requests +, scipy +, sortedcontainers +, sympy +, tqdm +, typing-extensions + # Contrib requirements +, withContribRequires ? false +, autoray ? null +, opt-einsum +, ply +, pylatex ? null +, pyquil ? null +, quimb ? null + # test inputs +, pytestCheckHook +, freezegun +, pytest-asyncio +}: +buildPythonPackage rec { + pname = "cirq-core"; + version = "0.11.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "quantumlib"; + repo = "cirq"; + rev = "v${version}"; + hash = "sha256-JaKTGnkYhzIFb35SGaho8DRupoT0JFYKA5+rJEq4oXw="; + }; + + sourceRoot = "source/${pname}"; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "matplotlib~=3.0" "matplotlib" \ + --replace "networkx~=2.4" "networkx" \ + --replace "numpy~=1.16" "numpy" \ + --replace "requests~=2.18" "requests" + ''; + + propagatedBuildInputs = [ + matplotlib + networkx + numpy + pandas + requests + scipy + sortedcontainers + sympy + tqdm + typing-extensions + ] ++ lib.optionals withContribRequires [ + autoray + opt-einsum + ply + pylatex + pyquil + quimb + ]; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + freezegun + ]; + + pytestFlagsArray = lib.optionals (!withContribRequires) [ + # requires external (unpackaged) libraries, so untested. + "--ignore=cirq/contrib/" + ]; + disabledTests = [ + "test_metadata_search_path" # tries to import flynt, which isn't in Nixpkgs + "test_benchmark_2q_xeb_fidelities" # fails due pandas MultiIndex. Maybe issue with pandas version in nix? + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ + # Seem to fail due to math issues on aarch64? + "expectation_from_wavefunction" + "test_single_qubit_op_to_framed_phase_form_output_on_example_case" + ]; + + meta = with lib; { + description = "A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits."; + homepage = "https://github.com/quantumlib/cirq"; + changelog = "https://github.com/quantumlib/Cirq/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6db0f528b1f..368897ae765 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1361,6 +1361,8 @@ in { cirq = callPackage ../development/python-modules/cirq { }; + cirq-core = callPackage ../development/python-modules/cirq-core { }; + ciscomobilityexpress = callPackage ../development/python-modules/ciscomobilityexpress { }; ciso8601 = callPackage ../development/python-modules/ciso8601 { }; From 1018fa91f6fba6525b05b6c0d8e91cafb840de89 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 19 May 2021 18:43:25 -0400 Subject: [PATCH 067/101] python3Packages.cirq-google: init at 0.11.0 --- .../python-modules/cirq-google/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/cirq-google/default.nix diff --git a/pkgs/development/python-modules/cirq-google/default.nix b/pkgs/development/python-modules/cirq-google/default.nix new file mode 100644 index 00000000000..8692aef4b67 --- /dev/null +++ b/pkgs/development/python-modules/cirq-google/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, pythonOlder +, cirq-core +, google-api-core +, protobuf +# test inputs +, pytestCheckHook +, freezegun +}: + +buildPythonPackage rec { + pname = "cirq-google"; + inherit (cirq-core) version src meta; + + sourceRoot = "source/${pname}"; + + postPatch = '' + substituteInPlace requirements.txt --replace "protobuf~=3.13.0" "protobuf" + ''; + + propagatedBuildInputs = [ + cirq-core + google-api-core + protobuf + ]; + + checkInputs = [ pytestCheckHook freezegun ]; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 368897ae765..58a6d6e49f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1363,6 +1363,8 @@ in { cirq-core = callPackage ../development/python-modules/cirq-core { }; + cirq-google = callPackage ../development/python-modules/cirq-google { }; + ciscomobilityexpress = callPackage ../development/python-modules/ciscomobilityexpress { }; ciso8601 = callPackage ../development/python-modules/ciso8601 { }; From 480984e69685c0d15d875f2d888743caa342b9c8 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 19 May 2021 18:43:52 -0400 Subject: [PATCH 068/101] python3Packages.cirq: 0.10.0 -> 0.11.0 Rework for the latest version of Cirq. Breaks the package into submodules that can be used somewhat independently. --- .../python-modules/cirq/default.nix | 112 ++---------------- 1 file changed, 13 insertions(+), 99 deletions(-) diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index f0b576299b2..f8afdcbbb05 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -1,114 +1,28 @@ -{ stdenv -, lib +{ lib , buildPythonPackage -, pythonOlder -, fetchFromGitHub -, google-api-core -, matplotlib -, networkx -, numpy -, pandas -, protobuf -, requests -, scipy -, sortedcontainers -, sympy -, tqdm -, typing-extensions +, cirq-core +, cirq-google # test inputs -, freezegun , pytestCheckHook -, pytest-asyncio -, pytest-benchmark -, ply -, pydot -, pyyaml -, pygraphviz }: buildPythonPackage rec { pname = "cirq"; - version = "0.10.0"; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "quantumlib"; - repo = "cirq"; - rev = "v${version}"; - sha256 = "0xinml44n2lfl0q2lb2apmn69gsszlwim83082f66vyk0gpwd4lr"; - }; - - postPatch = '' - substituteInPlace requirements.txt \ - --replace "matplotlib~=3.0" "matplotlib" \ - --replace "networkx~=2.4" "networkx" \ - --replace "numpy~=1.16" "numpy" \ - --replace "protobuf~=3.13.0" "protobuf" - ''; + inherit (cirq-core) version src meta; propagatedBuildInputs = [ - google-api-core - matplotlib - networkx - numpy - pandas - protobuf - requests - scipy - sortedcontainers - sympy - tqdm - typing-extensions + cirq-core + cirq-google ]; # pythonImportsCheck = [ "cirq" "cirq.Circuit" ]; # cirq's importlib hook doesn't work here - checkInputs = [ - pytestCheckHook - freezegun - pytest-asyncio - pytest-benchmark - ply - pydot - pyyaml - pygraphviz + checkInputs = [ pytestCheckHook ]; + + # Don't run submodule or development tool tests + disabledTestPaths = [ + "cirq-google" + "cirq-core" + "dev_tools" ]; - pytestFlagsArray = [ - "--ignore=dev_tools" # Only needed when developing new code, which is out-of-scope - "--ignore=cirq/contrib/" # requires external (unpackaged) python packages, so untested. - "--benchmark-disable" # Don't need to run benchmarks when packaging. - ]; - disabledTests = lib.optionals stdenv.isAarch64 [ - # Seem to fail due to math issues on aarch64? - "expectation_from_wavefunction" - "test_single_qubit_op_to_framed_phase_form_output_on_example_case" - ] ++ [ - # slow tests, for quicker building - "test_anneal_search_method_calls" - "test_density_matrix_from_state_tomography_is_correct" - "test_example_runs_qubit_characterizations" - "test_example_runs_hello_line_perf" - "test_example_runs_bc_mean_field_perf" - "test_main_loop" - "test_clifford_circuit_2" - "test_decompose_specific_matrices" - "test_two_qubit_randomized_benchmarking" - "test_kak_decomposition_perf" - "test_example_runs_simon" - "test_decompose_random_unitary" - "test_decompose_size_special_unitary" - "test_api_retry_5xx_errors" - "test_xeb_fidelity" - "test_example_runs_phase_estimator_perf" - "test_cross_entropy_benchmarking" - ]; - - meta = with lib; { - description = "A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits."; - homepage = "https://github.com/quantumlib/cirq"; - changelog = "https://github.com/quantumlib/Cirq/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ drewrisinger ]; - }; } From 80fcac0b311031657783b721c935d2d9348dffee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 19 May 2021 06:38:06 +0000 Subject: [PATCH 069/101] helmfile: 0.139.3 -> 0.139.6 --- pkgs/applications/networking/cluster/helmfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 4c6040c028b..90aa9447996 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmfile"; - version = "0.139.3"; + version = "0.139.6"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-Cg4FFTowrWMDfpaMJwrOSs3ykZxH378OMR+1+vJt5e8="; + sha256 = "sha256-pAo8MmQqqSICB4rguhkGHJqyB9fBBzpp7NEaa59rVb4="; }; vendorSha256 = "sha256-Hs09CT/KSwYL2AKLseOjWB5Xvvr5TvbzwDywsGQ9kMw="; From c5ef87542626ce9836144b8eb50f1c24d69aa465 Mon Sep 17 00:00:00 2001 From: Michael Francis Date: Wed, 19 May 2021 21:52:01 +0800 Subject: [PATCH 070/101] wayland: broken for darwin --- pkgs/development/libraries/wayland/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 4a685b43073..a06d75e53dc 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -111,6 +111,8 @@ stdenv.mkDerivation rec { license = licenses.mit; # Expat version platforms = if withLibraries then platforms.linux else platforms.unix; maintainers = with maintainers; [ primeos codyopel qyliss ]; + # big sur doesn't support gcc stdenv and wayland doesn't build with clang + broken = stdenv.isDarwin; }; passthru.version = version; From 5c87334112e72d1f776cc8f480375250a5be84d6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 19 May 2021 09:30:30 +0800 Subject: [PATCH 071/101] openmw: ffmpeg_3 -> ffmpeg --- pkgs/games/openmw/default.nix | 38 +++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 3357bf15f86..8e6ed3cdb82 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg_3 -, boost, cmake, SDL2, unshield, openal, libXt, pkg-config }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkg-config +, openscenegraph +, mygui +, bullet +, ffmpeg +, boost +, SDL2 +, unshield +, openal +, libXt +}: let openscenegraph_ = openscenegraph.overrideDerivation (self: { @@ -11,9 +24,9 @@ let sha256 = "0d74hijzmj82nx3jkv5qmr3pkgvplra0b8fbjx1y3vmzxamb0axd"; }; }); -in -stdenv.mkDerivation rec { +in +mkDerivation rec { version = "0.46.0"; pname = "openmw"; @@ -25,10 +38,23 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ boost ffmpeg_3 bullet mygui openscenegraph_ SDL2 unshield openal libXt qtbase ]; + + buildInputs = [ + SDL2 + boost + bullet + ffmpeg + libXt + mygui + openal + openscenegraph_ + unshield + ]; cmakeFlags = [ "-DDESIRED_QT_VERSION:INT=5" + # as of 0.46, openmw is broken with GLVND + "-DOpenGL_GL_PREFERENCE=LEGACY" ]; dontWrapQtApps = true; @@ -37,7 +63,7 @@ stdenv.mkDerivation rec { description = "An unofficial open source engine reimplementation of the game Morrowind"; homepage = "http://openmw.org"; license = licenses.gpl3Plus; - platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; }; } From 7fe78d4f9efc88e5c6a4b9591bd8b41fee656df6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 19 May 2021 15:15:48 +0800 Subject: [PATCH 072/101] openmw-tes3mp: unstable-2019-11-19 -> unstable-2020-08-07 --- pkgs/games/openmw/tes3mp.nix | 192 +++++++++++++++++++++-------------- 1 file changed, 115 insertions(+), 77 deletions(-) diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 863f818ed42..72b698ceb73 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -1,96 +1,134 @@ -{ lib, stdenv, cmake, openmw, fetchFromGitHub, luajit, makeWrapper, mygui }: +{ lib +, stdenv +, cmake +, openmw +, fetchFromGitHub +, formats +, luajit +, makeWrapper +, symlinkJoin +, mygui +, crudini +}: # revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy let - # TES3MP_STABLE_VERSION_FILE - compatHash = "292536439eeda58becdb7e441fe2e61ebb74529e"; - rakNet = fetchFromGitHub { - owner = "TES3MP"; - repo = "CrabNet"; - # usually fixed: - # https://github.com/GrimKriegor/TES3MP-deploy/blob/d2a4a5d3acb64b16d9b8ca85906780aeea8d311b/tes3mp-deploy.sh#L589 - rev = "4eeeaad2f6c11aeb82070df35169694b4fb7b04b"; - sha256 = "0p0li9l1i5lcliswm5w9jql0zff9i6fwhiq0bl130m4i7vpr4cr3"; - }; - rakNetLibrary = stdenv.mkDerivation { - name = "RakNetLibrary"; - src = rakNet; - nativeBuildInputs = [ cmake ]; - installPhase = '' - install -Dm755 lib/libRakNetLibStatic.a $out/lib/libRakNetLibStatic.a - ''; - }; - coreScripts = fetchFromGitHub { - owner = "TES3MP"; - repo = "CoreScripts"; - # usually latest in stable branch (e.g. 0.7.0) - rev = "24aae91d9ddad38cdb3b0e0a13af59f142803e94"; - sha256 = "1rfmxxr9ircfagdpbdrzl26msdhx1i3g974cblbv69078cradfh3"; - }; - # https://github.com/TES3MP/openmw-tes3mp/issues/555 - mygui_ = mygui.overrideAttrs (oldAttrs: rec { - version = "3.2.2"; + # raknet could also be split into dev and lib outputs + raknet = stdenv.mkDerivation { + pname = "raknet"; + version = "unstable-2018-07-14"; src = fetchFromGitHub { - owner = "MyGUI"; - repo = "mygui"; - rev = "MyGUI${version}"; - sha256 = "1wk7jmwm55rhlqqcyvqsxdmwvl70bysl9azh4kd9n57qlmgk3zmw"; + owner = "TES3MP"; + repo = "CrabNet"; + # usually fixed: + # https://github.com/GrimKriegor/TES3MP-deploy/blob/d2a4a5d3acb64b16d9b8ca85906780aeea8d311b/tes3mp-deploy.sh#L589 + rev = "4eeeaad2f6c11aeb82070df35169694b4fb7b04b"; + sha256 = "0p0li9l1i5lcliswm5w9jql0zff9i6fwhiq0bl130m4i7vpr4cr3"; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + install -Dm555 lib/libRakNetLibStatic.a $out/lib/libRakNetLibStatic.a + ''; + }; + + coreScripts = stdenv.mkDerivation { + pname = "corescripts"; + version = "unstable-2020-07-27"; + + src = fetchFromGitHub { + owner = "TES3MP"; + repo = "CoreScripts"; + # usually latest in stable branch (e.g. 0.7.1) + rev = "3c2d31595344db586d8585db0ef1fc0da89898a0"; + sha256 = "sha256-m/pt2Et58HOMc1xqllGf4hjPLXNcc14+X0h84ouZDeg="; + }; + + buildCommand = '' + dir=$out/share/openmw-tes3mp + mkdir -p $dir + cp -r $src $dir/CoreScripts + ''; + }; + + # build an unwrapped version so we don't have to rebuild it all over again in + # case the scripts or wrapper scripts change. + unwrapped = openmw.overrideAttrs (oldAttrs: rec { + pname = "openmw-tes3mp-unwrapped"; + version = "unstable-2020-08-07"; + + src = fetchFromGitHub { + owner = "TES3MP"; + repo = "openmw-tes3mp"; + # usually latest in stable branch (e.g. 0.7.1) + rev = "ce5df6d18546e37aac9746d99c00d27a7f34b00d"; + sha256 = "sha256-xLslShNA6rVFl9kt6BNGDpSYMpO25jBTCteLJoSTXdg="; + }; + + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ]; + + buildInputs = oldAttrs.buildInputs ++ [ luajit ]; + + cmakeFlags = oldAttrs.cmakeFlags ++ [ + "-DBUILD_OPENCS=OFF" + "-DRakNet_INCLUDES=${raknet.src}/include" + "-DRakNet_LIBRARY_RELEASE=${raknet}/lib/libRakNetLibStatic.a" + "-DRakNet_LIBRARY_DEBUG=${raknet}/lib/libRakNetLibStatic.a" + ]; + + # https://github.com/TES3MP/openmw-tes3mp/issues/552 + patches = [ ./tes3mp.patch ]; + + NIX_CFLAGS_COMPILE = "-fpermissive"; + + preConfigure = '' + substituteInPlace files/version.in \ + --subst-var-by OPENMW_VERSION_COMMITHASH ${src.rev} + ''; + + # move everything that we wrap out of the way + postInstall = '' + mkdir -p $out/libexec + mv $out/bin/tes3mp-* $out/libexec + ''; + + meta = with lib; { + description = "Multiplayer for TES3:Morrowind based on OpenMW"; + homepage = "https://tes3mp.com/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ peterhoeg ]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; }); -in openmw.overrideAttrs (oldAttrs: rec { - version = "2019-11-19"; - name = "openmw-tes3mp-${version}"; - src = fetchFromGitHub { - owner = "TES3MP"; - repo = "openmw-tes3mp"; - # usually latest in stable branch (e.g. 0.7.0) - rev = "ad9ee80641a3e22d0780daca051df7f4e90f3615"; - sha256 = "03a1vldiv5lk7yq6lhicx3qz8hjfxhind2dj0w9lg5839ljyk6jv"; + cfgFile = (formats.ini { }).generate "tes3mp-server.cfg" { + Plugins.home = "${coreScripts}/share/openmw-tes3mp/CoreScripts"; }; - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ]; - buildInputs = [ luajit mygui_ ] ++ oldAttrs.buildInputs; +in +symlinkJoin rec { + name = "openmw-tes3mp-${unwrapped.version}"; + inherit (unwrapped) version meta; - cmakeFlags = oldAttrs.cmakeFlags ++ [ - "-DBUILD_OPENCS=OFF" - "-DRakNet_INCLUDES=${rakNet}/include" - "-DRakNet_LIBRARY_RELEASE=${rakNetLibrary}/lib/libRakNetLibStatic.a" - "-DRakNet_LIBRARY_DEBUG=${rakNetLibrary}/lib/libRakNetLibStatic.a" - ]; + nativeBuildInputs = [ makeWrapper ]; - dontWrapQtApps = true; + paths = [ unwrapped ]; - # https://github.com/TES3MP/openmw-tes3mp/issues/552 - patches = [ - ./tes3mp.patch - ]; - NIX_CFLAGS_COMPILE = "-fpermissive"; + # crudini --merge will create the file if it doesn't exist + postBuild = '' + mkdir -p $out/bin - preConfigure = '' - substituteInPlace files/version.in \ - --subst-var-by OPENMW_VERSION_COMMITHASH ${compatHash} - ''; + dir=\''${XDG_CONFIG_HOME:-\$HOME/.config}/openmw - postInstall = '' - # components/process/processinvoker.cpp: path.prepend(QLatin1String("./")) - wrapProgram $out/bin/tes3mp-browser \ + makeWrapper ${unwrapped}/libexec/tes3mp-browser $out/bin/tes3mp-browser \ --run "cd $out/bin" - wrapProgram $out/bin/tes3mp-server \ - --run "mkdir -p ~/.config/openmw" \ - --run "cd ~/.config/openmw" \ - --run "[ -d CoreScripts ] || cp --no-preserve=mode -r ${coreScripts} CoreScripts" \ - --run "[ -f tes3mp-server.cfg ] || echo \"[Plugins] home = \$HOME/.config/openmw/CoreScripts\" > tes3mp-server.cfg" \ + + makeWrapper ${unwrapped}/libexec/tes3mp-server $out/bin/tes3mp-server \ + --run "mkdir -p $dir" \ + --run "${crudini}/bin/crudini --merge $dir/${cfgFile.name} < ${cfgFile}" \ --run "cd $out/bin" ''; - - meta = with lib; { - description = "Multiplayer for TES3:Morrowind based on OpenMW"; - homepage = "https://tes3mp.com/"; - license = licenses.gpl3; - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ ]; - }; -}) +} From 5c5d56f084cca526c0237e33a487074849d56692 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 May 2021 15:14:21 +0200 Subject: [PATCH 073/101] python3Packages.coqpit: init at 0.0.6.6 --- .../python-modules/coqpit/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/coqpit/default.nix diff --git a/pkgs/development/python-modules/coqpit/default.nix b/pkgs/development/python-modules/coqpit/default.nix new file mode 100644 index 00000000000..c4df114e24d --- /dev/null +++ b/pkgs/development/python-modules/coqpit/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "coqpit"; + version = "0.0.6.6"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "coqui-ai"; + repo = pname; + rev = "v${version}"; + sha256 = "0wb5wf84i5h4ycm732kn4316v7schhm91s2rrklfw9sny5dqmdnh"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "coqpit" + "coqpit.coqpit" + ]; + + meta = with lib; { + description = "Simple but maybe too simple config management through python data classes"; + longDescription = '' + Simple, light-weight and no dependency config handling through python data classes with to/from JSON serialization/deserialization. + ''; + homepage = "https://github.com/coqui-ai/coqpit"; + license = licenses.mit; + maintainers = with maintainers; [ hexa mic92 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 58a6d6e49f9..f331e80124b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1283,6 +1283,8 @@ in { connect-box = callPackage ../development/python-modules/connect_box { }; + coqpit = callPackage ../development/python-modules/coqpit { }; + cerberus = callPackage ../development/python-modules/cerberus { }; cert-chain-resolver = callPackage ../development/python-modules/cert-chain-resolver { }; From 66da2a69b424f46affab5b81967c00120de8f92e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 May 2021 15:14:29 +0200 Subject: [PATCH 074/101] tts: 0.0.13 -> 0.0.14 https://github.com/coqui-ai/TTS/releases/tag/v0.0.14 --- pkgs/tools/audio/tts/default.nix | 33 +++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index c70b907c792..51976a2d6a1 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -12,25 +12,26 @@ # # If you upgrade from an old version you may have to delete old models from ~/.local/share/tts # Also note that your tts version might not support all available models so check: -# https://github.com/coqui-ai/TTS/releases/tag/v0.0.13 +# https://github.com/coqui-ai/TTS/releases/tag/v0.0.14 # # For now, for deployment check the systemd unit in the pull request: # https://github.com/NixOS/nixpkgs/pull/103851#issue-521121136 python3Packages.buildPythonApplication rec { pname = "tts"; - version = "0.0.13"; + version = "0.0.14"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "1sh7sjkh7ihbkqc7sl4hnzci0n7gv4s140dykpb1havaqyfhjn8l"; + sha256 = "0cl0ri90mx0y19fmqww73lp5nv6qkpc45rm4157i7p6q6llajdhp"; }; - preBuild = '' + postPatch = '' sed -i -e 's!librosa==[^"]*!librosa!' requirements.txt sed -i -e 's!unidecode==[^"]*!unidecode!' requirements.txt + sed -i -e 's!numba==[^"]*!numba!' requirements.txt sed -i -e 's!numpy==[^"]*!numpy!' requirements.txt sed -i -e 's!umap-learn==[^"]*!umap-learn!' requirements.txt ''; @@ -40,14 +41,15 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ + coqpit flask gdown inflect jieba librosa matplotlib + numba pandas - phonemizer pypinyin pysbd pytorch @@ -69,6 +71,7 @@ python3Packages.buildPythonApplication rec { ''; checkInputs = with python3Packages; [ + pytest-sugar pytestCheckHook ]; @@ -77,10 +80,6 @@ python3Packages.buildPythonApplication rec { "test_torch_stft" "test_stft_loss" "test_multiscale_stft_loss" - # assert tensor(1.1904e-07, dtype=torch.float64) <= 0 - "test_parametrized_gan_dataset" - # RuntimeError: expected scalar type Double but found Float - "test_speaker_embedding" # Requires network acccess to download models "test_synthesize" ]; @@ -92,13 +91,25 @@ python3Packages.buildPythonApplication rec { # numba tries to write to HOME directory export HOME=$TMPDIR + + for file in $(grep -rl 'python TTS/bin' tests); do + substituteInPlace "$file" \ + --replace "python TTS/bin" "${python3.interpreter} $out/lib/${python3.libPrefix}/site-packages/TTS/bin" + done ''; disabledTestPaths = [ # requires tensorflow "tests/test_tacotron2_tf_model.py" - "tests/test_vocoder_tf_melgan_generator.py" - "tests/test_vocoder_tf_pqmf.py" + "tests/vocoder_tests/test_vocoder_tf_pqmf.py" + "tests/vocoder_tests/test_vocoder_tf_melgan_generator.py" + # RuntimeError: fft: ATen not compiled with MKL support + "tests/vocoder_tests/test_fullband_melgan_train.py" + "tests/vocoder_tests/test_hifigan_train.py" + "tests/vocoder_tests/test_melgan_train.py" + "tests/vocoder_tests/test_multiband_melgan_train.py" + "tests/vocoder_tests/test_parallel_wavegan_train.py" + ]; meta = with lib; { From 1dce06f8c559a0596803899ca053bbd8e11f50ca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 May 2021 15:17:40 +0200 Subject: [PATCH 075/101] python3Packages.phonemizer: stop maintaining the package --- pkgs/development/python-modules/phonemizer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index 43ce5f1e766..8eab09046dc 100644 --- a/pkgs/development/python-modules/phonemizer/default.nix +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -65,6 +65,6 @@ buildPythonApplication rec { homepage = "https://github.com/bootphon/phonemizer"; description = "Simple text to phones converter for multiple languages"; license = licenses.gpl3; - maintainers = with maintainers; [ hexa ]; + maintainers = with maintainers; [ ]; }; } From 725b301206eec7caa14eb39bdc542c3a872cbadb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 May 2021 15:18:17 +0200 Subject: [PATCH 076/101] python3Packages.segments: stop maintaining the package --- pkgs/development/python-modules/segments/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix index 00953a8e909..f1c0ad3bf0e 100644 --- a/pkgs/development/python-modules/segments/default.nix +++ b/pkgs/development/python-modules/segments/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Unicode Standard tokenization routines and orthography profile segmentation"; homepage = "https://github.com/cldf/segments"; license = licenses.asl20; - maintainers = with maintainers; [ hexa ]; + maintainers = with maintainers; [ ]; }; } From 4d6ce1c397f7206efb9bf539571bbec481f4b0f4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 May 2021 03:49:31 +0000 Subject: [PATCH 077/101] bemenu: 0.5.0 -> 0.6.0 --- pkgs/applications/misc/bemenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 42c0f7d05fd..c61b8b60101 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "1ifq5bk7782b9m6bl111x33fn38rpppdrww7hfavqia9a9gi2sl5"; + sha256 = "sha256-yhUc1r7HulOUQvH7fLXaoJa0mKxJwyC3y59pnJcHUpk="; }; nativeBuildInputs = [ pkg-config pcre ]; From b34ab9683cee9f51dfe2ad97bc5632d2e3683bd4 Mon Sep 17 00:00:00 2001 From: Mica Semrick Date: Tue, 18 May 2021 19:42:40 -0700 Subject: [PATCH 078/101] wlc: init at 1.11 --- pkgs/tools/misc/wlc/default.nix | 36 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/misc/wlc/default.nix diff --git a/pkgs/tools/misc/wlc/default.nix b/pkgs/tools/misc/wlc/default.nix new file mode 100644 index 00000000000..874e31ca6ef --- /dev/null +++ b/pkgs/tools/misc/wlc/default.nix @@ -0,0 +1,36 @@ +{ lib +, python3 +}: + +with python3.pkgs; + +buildPythonPackage rec { + pname = "wlc"; + version = "1.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256:0ysx250v2qycy1m3jj0wxmyf2f5n8fxf6br69vcbyq2cnqw609nx"; + }; + + propagatedBuildInputs = [ + argcomplete + python-dateutil + requests + pyxdg + pre-commit + responses + twine + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "wlc is a Weblate commandline client using Weblate's REST API."; + homepage = "https://github.com/WeblateOrg/wlc"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ paperdigits ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70765f80a14..08a3bc84f03 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27117,6 +27117,8 @@ in write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { }; + wlc = callPackage ../tools/misc/wlc { }; + wllvm = callPackage ../development/tools/wllvm { }; wmname = callPackage ../applications/misc/wmname { }; From 40da7cda407959ebe9c8306de94549b8baf9466a Mon Sep 17 00:00:00 2001 From: Zach Date: Sun, 2 May 2021 22:28:52 -0500 Subject: [PATCH 079/101] mix2nix: init at 0.1.2 --- maintainers/maintainer-list.nix | 10 +++++++++ pkgs/development/tools/mix2nix/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 pkgs/development/tools/mix2nix/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6afb908b723..429991d1678 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11465,6 +11465,16 @@ github = "pulsation"; githubId = 1838397; }; + ydlr = { + name = "ydlr"; + email = "ydlr@ydlr.io"; + github = "ydlr"; + githubId = 58453832; + keys = [{ + longkeyid = "rsa4096/0x43AB44130A29AD9D"; + fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; + }]; + }; zane = { name = "Zane van Iperen"; email = "zane@zanevaniperen.com"; diff --git a/pkgs/development/tools/mix2nix/default.nix b/pkgs/development/tools/mix2nix/default.nix new file mode 100644 index 00000000000..9fadaae89ea --- /dev/null +++ b/pkgs/development/tools/mix2nix/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchFromGitHub, elixir, erlang }: + +stdenv.mkDerivation { + pname = "mix2nix"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "ydlr"; + repo = "mix2nix"; + rev = "b153a252f0689d3f6919e16c2df2fb3b6bcc9d2a"; + sha256 = "15wyz7gdjywsqvsf1ad9gklvqsqi7lwgmyks3bjlc2sk6kpdxdmi"; + }; + + buildInputs = [ elixir erlang ]; + + buildPhase = "mix escript.build"; + installPhase = "install -Dt $out/bin mix2nix"; + + meta = with lib; { + description = "Generate nix expressions from mix.lock file."; + license = licenses.mit; + maintainers = with maintainers; [ ydlr beam ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08a3bc84f03..4febffb5de0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -269,6 +269,8 @@ in inherit (darwin.apple_sdk.frameworks) AppKit IOKit; }; + mix2nix = callPackage ../development/tools/mix2nix/default.nix { }; + proto-contrib = callPackage ../development/tools/proto-contrib {}; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; From ed79a66359926a14ba8a28145c020a65d429aa05 Mon Sep 17 00:00:00 2001 From: Zach Date: Sun, 2 May 2021 22:53:58 -0500 Subject: [PATCH 080/101] use `teams.beam.members` to add beam team to maintainers --- pkgs/development/tools/mix2nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/mix2nix/default.nix b/pkgs/development/tools/mix2nix/default.nix index 9fadaae89ea..893b43f83a3 100644 --- a/pkgs/development/tools/mix2nix/default.nix +++ b/pkgs/development/tools/mix2nix/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = with lib; { description = "Generate nix expressions from mix.lock file."; license = licenses.mit; - maintainers = with maintainers; [ ydlr beam ]; + maintainers = with maintainers; [ ydlr ] ++ teams.beams.members; }; } From 02e934e94d00ee5825947b6f1e9ef931c558812b Mon Sep 17 00:00:00 2001 From: Zach Date: Sun, 2 May 2021 23:10:06 -0500 Subject: [PATCH 081/101] fix typo in maintainers list --- pkgs/development/tools/mix2nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/mix2nix/default.nix b/pkgs/development/tools/mix2nix/default.nix index 893b43f83a3..b6f9bdace02 100644 --- a/pkgs/development/tools/mix2nix/default.nix +++ b/pkgs/development/tools/mix2nix/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { meta = with lib; { description = "Generate nix expressions from mix.lock file."; license = licenses.mit; - maintainers = with maintainers; [ ydlr ] ++ teams.beams.members; + maintainers = with maintainers; [ ydlr ] ++ teams.beam.members; }; } From f461c82d974ba04f63c71114a67376538cca0556 Mon Sep 17 00:00:00 2001 From: Zach Date: Mon, 17 May 2021 18:18:42 -0500 Subject: [PATCH 082/101] bump to newest mix2nix version and move elixir to nativeBuildInputs --- pkgs/development/tools/mix2nix/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/mix2nix/default.nix b/pkgs/development/tools/mix2nix/default.nix index b6f9bdace02..44e4762c23a 100644 --- a/pkgs/development/tools/mix2nix/default.nix +++ b/pkgs/development/tools/mix2nix/default.nix @@ -2,16 +2,17 @@ stdenv.mkDerivation { pname = "mix2nix"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "ydlr"; repo = "mix2nix"; - rev = "b153a252f0689d3f6919e16c2df2fb3b6bcc9d2a"; - sha256 = "15wyz7gdjywsqvsf1ad9gklvqsqi7lwgmyks3bjlc2sk6kpdxdmi"; + rev = "66c277bdffb93da9a63e3f1ea42432a73e572b51"; + sha256 = "11qn80im5zfbx25ibxqrgi90mglf8pnsmrqsami633mcf2gvj2hy"; }; - buildInputs = [ elixir erlang ]; + nativeBuildInputs = [ elixir ]; + buildInputs = [ erlang ]; buildPhase = "mix escript.build"; installPhase = "install -Dt $out/bin mix2nix"; From 36bdd752d615e532cc31b2f8413e38e04c1dd2bb Mon Sep 17 00:00:00 2001 From: Zach Date: Wed, 19 May 2021 21:49:17 -0500 Subject: [PATCH 083/101] use version number as rev for git source --- pkgs/development/tools/mix2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/mix2nix/default.nix b/pkgs/development/tools/mix2nix/default.nix index 44e4762c23a..e814f44757f 100644 --- a/pkgs/development/tools/mix2nix/default.nix +++ b/pkgs/development/tools/mix2nix/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, elixir, erlang }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "mix2nix"; version = "0.1.3"; src = fetchFromGitHub { owner = "ydlr"; repo = "mix2nix"; - rev = "66c277bdffb93da9a63e3f1ea42432a73e572b51"; + rev = version; sha256 = "11qn80im5zfbx25ibxqrgi90mglf8pnsmrqsami633mcf2gvj2hy"; }; From aaf8d15a6b234daac59dd5cf6cac9f85ff689c78 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 19 May 2021 11:55:47 -0700 Subject: [PATCH 084/101] alacritty: 0.7.2 -> 0.8.0 --- .../applications/terminal-emulators/alacritty/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 20d24a904e7..62a338909f2 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -52,16 +52,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VXV6w4OnhJBmvMKl7CynbhI9LclTKaSr+5DhHXMwSsc="; + sha256 = "sha256-9pQqnsLMkzhKTs7WGhf6lac/LGot6EmJQxgFBTrHA4E="; }; - cargoSha256 = "sha256-PWnNTMNZKxsfS1OAXe4G3zjfg5gK1SMTc0JJrW90iSM="; + cargoSha256 = "sha256-NtDeXS2g+5RzKHJdDrbzL5oReS42SzuEubkfZ4gbkFc="; nativeBuildInputs = [ cmake @@ -86,7 +86,7 @@ rustPlatform.buildRustPackage rec { outputs = [ "out" "terminfo" ]; postPatch = '' - substituteInPlace alacritty/src/config/mouse.rs \ + substituteInPlace alacritty/src/config/ui_config.rs \ --replace xdg-open ${xdg-utils}/bin/xdg-open ''; From 607a5e77245522d62b20f4dc1e555b03f07ee83d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Wed, 19 May 2021 20:55:55 +0200 Subject: [PATCH 085/101] reproxy: 0.5.1 -> 0.6.0 --- pkgs/servers/reproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/reproxy/default.nix b/pkgs/servers/reproxy/default.nix index 29a2f485abd..0a9095857e4 100644 --- a/pkgs/servers/reproxy/default.nix +++ b/pkgs/servers/reproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "reproxy"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "umputun"; repo = pname; rev = "v${version}"; - hash = "sha256-RB3+IU6halnk/2REh2CLDpQN7djn4Y1QuL8y8xppnQw="; + hash = "sha256-8veGMiRT59oLcMUxERI+2uRQVvbiuXTbrBi1GqoPe0M="; }; postPatch = '' From 2bab7f632d7ceae72aab1f332e4bcb6a79fff9c9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 May 2021 06:50:44 +0000 Subject: [PATCH 086/101] gh: 1.10.1 -> 1.10.2 --- .../version-management/git-and-tools/gh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 4b2ec37b49c..bb3fcb3bb87 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-ESwgG1sMkR44KpO7k5HNR3gPBgOqIADpS6fSOqqNn2Q="; + sha256 = "sha256-hI4kV7Xj0oMEfD6SzZ+KWHmMp9yGtr18HPPwkOpr5JA="; }; vendorSha256 = "sha256-A7Bo0HQ5Z2SXY32jWCYgwvvInD3xYLSXvipzeaQTDiM="; From 59f9ab3337d7c41a34995e09b937ddb60c03a82e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 20 May 2021 10:38:26 +0200 Subject: [PATCH 087/101] retroshare: drop (#123345) It was marked as broken in 2018. --- .../networking/p2p/retroshare/default.nix | 59 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 pkgs/applications/networking/p2p/retroshare/default.nix diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix deleted file mode 100644 index f0fb5a1239a..00000000000 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome, glib, libssh, pkg-config, protobuf, bzip2 -, libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg_3 -, qtmultimedia, qtx11extras, qttools }: - -stdenv.mkDerivation rec { - pname = "retroshare"; - version = "0.6.2"; - - src = fetchFromGitHub { - owner = "RetroShare"; - repo = "RetroShare"; - rev = "v${version}"; - sha256 = "0hly2x87wdvqzzwf3wjzi7092bj8fk4xs6302rkm8gp9bkkmiiw8"; - }; - - # NIX_CFLAGS_COMPILE = [ "-I${glib.dev}/include/glib-2.0" "-I${glib.dev}/lib/glib-2.0/include" "-I${libxml2.dev}/include/libxml2" "-I${sqlcipher}/include/sqlcipher" ]; - - patchPhase = '' - # Fix build error - sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \ - libretroshare/src/upnp/UPnPBase.cpp - ''; - - nativeBuildInputs = [ pkg-config qmake ]; - buildInputs = [ - speex libupnp gpgme gnome.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools - protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg_3 - ]; - - preConfigure = '' - qmakeFlags="$qmakeFlags DESTDIR=$out" - ''; - - # gui/settings/PluginsPage.h:25:28: fatal error: ui_PluginsPage.h: No such file or directory - enableParallelBuilding = false; - - postInstall = '' - mkdir -p $out/bin - mv $out/RetroShare06-nogui $out/bin/RetroShare-nogui - mv $out/RetroShare06 $out/bin/Retroshare - ln -s $out/bin/RetroShare-nogui $out/bin/retroshare-nogui - - # plugins - mkdir -p $out/share/retroshare - mv $out/lib* $out/share/retroshare - - # BT DHT bootstrap - cp libbitdht/src/bitdht/bdboot.txt $out/share/retroshare - ''; - - meta = with lib; { - description = ""; - homepage = "http://retroshare.sourceforge.net/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ ]; - broken = true; # broken by libupnp: 1.6.21 -> 1.8.3 (#41684) - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b7d73f1663d..a275fbd8057 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -642,6 +642,7 @@ mapAliases ({ rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 readline80 = throw "readline-8.0 is no longer supported in nixpkgs, please use 'readline' for main supported version or 'readline81' for most recent version"; # added 2021-04-22 + retroshare = throw "retroshare was removed because it was broken"; # added 2021-05-17 rhc = throw "rhc was deprecated on 2019-04-09: abandoned by upstream."; rng_tools = rng-tools; # added 2018-10-24 robomongo = robo3t; #added 2017-09-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75705935e78..a332d6dbed5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26025,10 +26025,6 @@ in remotebox = callPackage ../applications/virtualization/remotebox { }; - # This package is currently broken with libupnp - # But when unbroken, it should work with the stable Qt5 - retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; - rgp = libsForQt5.callPackage ../development/tools/rgp { }; ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { }; From 58c0175dfed55d3e280a3ff6e37f6f9581062d8d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 May 2021 08:14:12 +0000 Subject: [PATCH 088/101] jackett: 0.18.15 -> 0.18.95 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index dcb3ed7a25a..b9c73e60288 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.15"; + version = "0.18.95"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-z2xmF4FIv+z7ybPE7b8ZeC1+jlFi2H2J7HT09Bqyyhs="; + sha256 = "sha256-8TkIixPot4V0h4MBh/+WdrWhjgsqyq9wHQyGyfxqZ6s="; }; nativeBuildInputs = [ makeWrapper ]; From 1f0fd6dbe45f7a52244569f851cfb2e64c44b1c0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 May 2021 04:51:22 +0000 Subject: [PATCH 089/101] i2pd: 2.37.0 -> 2.38.0 --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 7f27efc8730..48ebf33c41b 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.37.0"; + version = "2.38.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-//ootg0RZR2vzO702jGXuJ5qGMO49GSG0Lw6dKzGGt8="; + sha256 = "sha256-8wy6Zdnw0JgnHFLa1U3qlzjpDIqi2gykbkkV7lh+Zag="; }; buildInputs = with lib; [ boost zlib openssl ] From e018962dd4cec102514eff367e340e187ec373d1 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 20 May 2021 10:23:39 +0200 Subject: [PATCH 090/101] skopeo: 1.2.3 -> 1.3.0 Signed-off-by: Sascha Grunert --- pkgs/development/tools/skopeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index db43c7f8e47..2af1d5e2a07 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-GhLw8wt5eDixKNGtxGA0Fjw3auQ3AsjKa+0M4mLTQlg="; + sha256 = "sha256-ZHEujkl+GUk5WjgDWdbJwOIKuOqJnIpGnvD1SsrHuhI="; }; outputs = [ "out" "man" ]; From d0335f16b5bb5d19b5ecc1189729b82b5c7f0175 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 May 2021 10:21:52 +0000 Subject: [PATCH 091/101] bind: 9.16.15 -> 9.16.16 --- pkgs/servers/dns/bind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 99366d24439..6fd7eb42c99 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.16.15"; + version = "9.16.16"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "0fbqisrh84f8wszm94cqp7v8q9r7pql3qyzbay7vz9vqv0rg9dlq"; + sha256 = "sha256-bJE5Aq34eOfcXiKc6pT678nUD0R3WjAhPt0Ihg92HXs="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; From 2f2e8a0009e79e866464e061ee30a036ad8c94bb Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 20 May 2021 12:09:26 +0100 Subject: [PATCH 092/101] boundary: 0.2.1 -> 0.2.2 Co-authored-by: Robert Hensing --- pkgs/tools/networking/boundary/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index 7604885eccd..31fd2e70d4a 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,25 +2,26 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.2.1"; + version = "0.2.2"; src = let inherit (stdenv.hostPlatform) system; - suffix = { + selectSystem = attrs: attrs.${system} or (throw "Unsupported system: ${system}"); + suffix = selectSystem { x86_64-linux = "linux_amd64"; aarch64-linux = "linux_arm64"; x86_64-darwin = "darwin_amd64"; - }.${system} or (throw "Unsupported system: ${system}"); - fetchsrc = version: sha256: fetchzip { - url = "https://releases.hashicorp.com/boundary/${version}/boundary_${version}_${suffix}.zip"; - sha256 = sha256.${system}; + }; + sha256 = selectSystem { + x86_64-linux = "sha256-K9WlOS9pRhBcoGaSZ3AhbGoTfKUrn4SDq50x6wnIib8="; + aarch64-linux = "sha256-BRm0Hy9vuxZSYINrPIMwl2UGZdWTSixLT8EJ1OzCGMg="; + x86_64-darwin = "sha256-pinmzz6GbQWAj3Ut/IB2o75w8X+CS2tXhE6nekYO4vc="; }; in - fetchsrc version { - x86_64-linux = "sha256-DDrsgZlnDF+WlBKyDi1McqcXEe5mAxoq5WW60p5qFQ8="; - aarch64-linux = "sha256-z9puhWmWf6G2C9PItKD4KL742UjVyVE/TDIu0gpOKd4="; - x86_64-darwin = "sha256-hDZPKi5R0seLbkHe7V4Vm+FarI6HrSZJF9JBJBa9O2Y="; + fetchzip { + url = "https://releases.hashicorp.com/boundary/${version}/boundary_${version}_${suffix}.zip"; + inherit sha256; }; dontConfigure = true; From 565c83c7a84e1d8c5f14d7f2f0707f8c756e9a81 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 May 2021 04:27:01 -0700 Subject: [PATCH 093/101] abcmidi: 2021.05.10 -> 2021.05.19 (#123792) --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 62b45b65dc1..25c8d281917 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2021.05.10"; + version = "2021.05.19"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "sha256-ID27OdtuSYtD8bOPb6b0vUDdRqJvRX5TsjRBILTom4o="; + sha256 = "sha256-QdzP9CJrENLVYnWFTvRqn6Jz95zD6JWIMpnCa34QGas="; }; meta = with lib; { From 2d166601af4acbf659aa02cf5ca62b485c5c35b9 Mon Sep 17 00:00:00 2001 From: benneti Date: Thu, 20 May 2021 13:37:43 +0200 Subject: [PATCH 094/101] rmapi: 0.0.13 -> 0.0.15 (#123672) --- pkgs/applications/misc/remarkable/rmapi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/remarkable/rmapi/default.nix b/pkgs/applications/misc/remarkable/rmapi/default.nix index e2a5f348da5..11373756f8d 100644 --- a/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rmapi"; - version = "0.0.13"; + version = "0.0.15"; src = fetchFromGitHub { owner = "juruen"; repo = "rmapi"; rev = "v${version}"; - sha256 = "0qq8x37p7yxhcp5d5xss3pv5186xgg0hd6lbkqivhy5yjsd54c7b"; + sha256 = "sha256-ju54JSd3Zyye5YGLPEOkhY93ONh0b7eDSnvJlIawizE="; }; - vendorSha256 = "1pa75rjns1kknl2gmfprdzc3f2z8dk44jkz6dmf8f3prj0z7x88c"; + vendorSha256 = "sha256-SE/0a8QUJsWoGwkSiZqYx1eXuOIL3avJujyg8iSdcBU="; doCheck = false; @@ -19,7 +19,7 @@ buildGoModule rec { description = "A Go app that allows access to the ReMarkable Cloud API programmatically"; homepage = "https://github.com/juruen/rmapi"; changelog = "https://github.com/juruen/rmapi/blob/v${version}/CHANGELOG.md"; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = [ maintainers.nickhu ]; }; } From a5eee47d7f49c1b629b100fa657c545153f40ba1 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Thu, 20 May 2021 09:46:51 -0400 Subject: [PATCH 095/101] fx_cast_bridge: 0.0.7 -> 0.1.2 (#121963) The prevision version was out-of-date and incompatible with the latest extension. This also updates to build from source. Right now we also ship the devDependencies of the bridge due to limitations in node2nix. --- pkgs/tools/misc/fx_cast/default.nix | 117 +- pkgs/tools/misc/fx_cast/node-env.nix | 567 +++++++ pkgs/tools/misc/fx_cast/node-packages.nix | 1706 +++++++++++++++++++++ pkgs/tools/misc/fx_cast/package-lock.json | 1327 ++++++++++++++++ pkgs/tools/misc/fx_cast/package.json | 41 + 5 files changed, 3689 insertions(+), 69 deletions(-) create mode 100644 pkgs/tools/misc/fx_cast/node-env.nix create mode 100644 pkgs/tools/misc/fx_cast/node-packages.nix create mode 100644 pkgs/tools/misc/fx_cast/package-lock.json create mode 100644 pkgs/tools/misc/fx_cast/package.json diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix index 4fcb5a65573..e3458ccfe5c 100644 --- a/pkgs/tools/misc/fx_cast/default.nix +++ b/pkgs/tools/misc/fx_cast/default.nix @@ -1,85 +1,64 @@ -{ lib, stdenv, fetchurl, dpkg }: - +# How to generate a new version: +# +# Update version and hash as usual. +# +# ``` +# cd fx_cast/app +# # Add `"name": "fx_cast_bridge", "version": "...",` to package.json and package-lock.json +# nix run nixpkgs.nodePackages.node2nix -c node2nix -l package-lock.json -d +# cp -v node-*.nix package*.json ~/p/nixpkgs/pkgs/tools/misc/fx_cast/app +# ``` +{ pkgs, stdenv, system }: let + nodeEnv = import ./node-env.nix { + inherit (pkgs) nodejs stdenv lib python2 runCommand writeTextFile; + inherit pkgs; + libtool = if stdenv.isDarwin then pkgs.darwin.cctools else null; + }; + nodePackages = import ./node-packages.nix { + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit nodeEnv; + globalBuildInputs = [pkgs.avahi-compat]; + }; +in stdenv.mkDerivation rec { - pname = "fx_cast_bridge"; - version = "0.0.7"; + name = "fx_cast_bridge-${version}"; + version = "0.1.2"; - src = fetchurl { - url = "https://github.com/hensm/fx_cast/releases/download/v${version}/${pname}-${version}-x64.deb"; - sha256 = "0kd58vzsq1qzl7qsh1qv25ylxvr5y37li03gjb48x4vhd85slzz5"; + src = pkgs.fetchFromGitHub { + owner = "hensm"; + repo = "fx_cast"; + rev = "v${version}"; + hash = "sha256:1prgk9669xgwkdl39clq0l75n0gnkkpn27gp9rbgl4bafrhvmg9a"; }; - nativeBuildInputs = [ dpkg ]; + buildInputs = with pkgs; [ + nodejs + ]; - unpackPhase = '' - runHook preUnpack - dpkg-deb -xv $src ./ - runHook postUnpack + buildPhase = '' + ln -vs ${nodePackages.nodeDependencies}/lib/node_modules app/node_modules + npm run build:app ''; - dontBuild = true; - dontPatchELF = true; - installPhase = '' - install -DT {opt/fx_cast,$out/bin}/${pname} - install -DT {usr,$out}/lib/mozilla/native-messaging-hosts/${pname}.json + mkdir -p $out/bin $out/lib/mozilla/native-messaging-hosts $out/opt - substituteInPlace $out/lib/mozilla/native-messaging-hosts/${pname}.json \ - --replace {/opt/fx_cast,$out/bin}/${pname} + substituteInPlace dist/app/fx_cast_bridge.json \ + --replace "$(realpath dist/app/fx_cast_bridge.sh)" "$out/bin/fx_cast_bridge" + mv dist/app/fx_cast_bridge.json $out/lib/mozilla/native-messaging-hosts + + echo "#! /bin/sh + NODE_PATH=${nodePackages.nodeDependencies}/lib/node_modules exec ${pkgs.nodejs}/bin/node $out/opt/fx_cast_bridge/src/main.js --_name fx_cast_bridge \"\$@\" + " >$out/bin/fx_cast_bridge + chmod +x $out/bin/fx_cast_bridge + + mv dist/app $out/opt/fx_cast_bridge ''; - # See now-cli/default.nix - dontStrip = true; - preFixup = let - libPath = lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc]; - bin = "$out/bin/${pname}"; - in '' - - orig_size=$(stat --printf=%s ${bin}) - - patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" ${bin} - patchelf --set-rpath ${libPath} ${bin} - chmod +x ${bin} - - new_size=$(stat --printf=%s ${bin}) - - ###### zeit-pkg fixing starts here. - # we're replacing plaintext js code that looks like - # PAYLOAD_POSITION = '1234 ' | 0 - # [...] - # PRELUDE_POSITION = '1234 ' | 0 - # ^-----20-chars-----^^------22-chars------^ - # ^-- grep points here - # - # var_* are as described above - # shift_by seems to be safe so long as all patchelf adjustments occur - # before any locations pointed to by hardcoded offsets - - var_skip=20 - var_select=22 - shift_by=$(expr $new_size - $orig_size) - - function fix_offset { - # $1 = name of variable to adjust - location=$(grep -obUam1 "$1" ${bin} | cut -d: -f1) - location=$(expr $location + $var_skip) - - value=$(dd if=${bin} iflag=count_bytes,skip_bytes skip=$location \ - bs=1 count=$var_select status=none) - value=$(expr $shift_by + $value) - - echo -n $value | dd of=${bin} bs=1 seek=$location conv=notrunc - } - - fix_offset PAYLOAD_POSITION - fix_offset PRELUDE_POSITION - - ''; - - meta = with lib; { + meta = with pkgs.lib; { description = "Implementation of the Chrome Sender API (Chromecast) within Firefox"; homepage = "https://hensm.github.io/fx_cast/"; license = licenses.mit; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ dtzWill kevincox ]; }; } diff --git a/pkgs/tools/misc/fx_cast/node-env.nix b/pkgs/tools/misc/fx_cast/node-env.nix new file mode 100644 index 00000000000..c2b723195b7 --- /dev/null +++ b/pkgs/tools/misc/fx_cast/node-env.nix @@ -0,0 +1,567 @@ +# This file originates from node2nix + +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: + +let + # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master + utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; + + python = if nodejs ? python then nodejs.python else python2; + + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise + tarWrapper = runCommand "tarWrapper" {} '' + mkdir -p $out/bin + + cat > $out/bin/tar <> $out/nix-support/hydra-build-products + ''; + }; + + includeDependencies = {dependencies}: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: + '' + # Bundle the dependencies of the package + mkdir -p node_modules + cd node_modules + + # Only include dependencies if they don't exist. They may also be bundled in the package. + if [ ! -e "${dependency.name}" ] + then + ${composePackage dependency} + fi + + cd .. + '' + ) dependencies); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + DIR=$(pwd) + cd $TMPDIR + + unpackFile ${src} + + # Make the base dir in which the target dependency resides first + mkdir -p "$(dirname "$DIR/${packageName}")" + + if [ -f "${src}" ] + then + # Figure out what directory has been unpacked + packageDir="$(find . -maxdepth 1 -type d | tail -1)" + + # Restore write permissions to make building work + find "$packageDir" -type d -exec chmod u+x {} \; + chmod -R u+w "$packageDir" + + # Move the extracted tarball into the output folder + mv "$packageDir" "$DIR/${packageName}" + elif [ -d "${src}" ] + then + # Get a stripped name (without hash) of the source directory. + # On old nixpkgs it's already set internally. + if [ -z "$strippedName" ] + then + strippedName="$(stripHash ${src})" + fi + + # Restore write permissions to make building work + chmod -R u+w "$strippedName" + + # Move the extracted directory into the output folder + mv "$strippedName" "$DIR/${packageName}" + fi + + # Unset the stripped name to not confuse the next unpack step + unset strippedName + + # Include the dependencies of the package + cd "$DIR/${packageName}" + ${includeDependencies { inherit dependencies; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ''; + + pinpointDependencies = {dependencies, production}: + let + pinpointDependenciesFromPackageJSON = writeTextFile { + name = "pinpointDependencies.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function resolveDependencyVersion(location, name) { + if(location == process.env['NIX_STORE']) { + return null; + } else { + var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); + + if(fs.existsSync(dependencyPackageJSON)) { + var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); + + if(dependencyPackageObj.name == name) { + return dependencyPackageObj.version; + } + } else { + return resolveDependencyVersion(path.resolve(location, ".."), name); + } + } + } + + function replaceDependencies(dependencies) { + if(typeof dependencies == "object" && dependencies !== null) { + for(var dependency in dependencies) { + var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); + + if(resolvedVersion === null) { + process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); + } else { + dependencies[dependency] = resolvedVersion; + } + } + } + } + + /* Read the package.json configuration */ + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Pinpoint all dependencies */ + replaceDependencies(packageObj.dependencies); + if(process.argv[2] == "development") { + replaceDependencies(packageObj.devDependencies); + } + replaceDependencies(packageObj.optionalDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. + } + + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(![1, 2].includes(packageLock.lockfileVersion)) { + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 1, + requires: true, + dependencies: {} + }; + + function augmentPackageJSON(filePath, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild + + if [ "''${dontNpmInstall-}" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install + fi + ''; + + # Builds and composes an NPM package including all its dependencies + buildNodePackage = + { name + , packageName + , version + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + in + stdenv.mkDerivation ({ + name = "node_${name}-${version}"; + buildInputs = [ tarWrapper python nodejs ] + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit nodejs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; + + compositionScript = composePackage args; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; + + installPhase = '' + # Create and enter a root node_modules/ folder + mkdir -p $out/lib/node_modules + cd $out/lib/node_modules + + # Compose the package and all its dependencies + source $compositionScriptPath + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Create symlink to the deployed executable folder, if applicable + if [ -d "$out/lib/node_modules/.bin" ] + then + ln -s $out/lib/node_modules/.bin $out/bin + fi + + # Create symlinks to the deployed manual page folders, if applicable + if [ -d "$out/lib/node_modules/${packageName}/man" ] + then + mkdir -p $out/share + for dir in "$out/lib/node_modules/${packageName}/man/"* + do + mkdir -p $out/share/man/$(basename "$dir") + for page in "$dir"/* + do + ln -s $page $out/share/man/$(basename "$dir") + done + done + fi + + # Run post install hook, if provided + runHook postInstall + ''; + } // extraArgs); + + # Builds a node environment (a node_modules folder and a set of binaries) + buildNodeDependencies = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + in + stdenv.mkDerivation ({ + name = "node-dependencies-${name}-${version}"; + + buildInputs = [ tarWrapper python nodejs ] + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall unpackPhase buildPhase; + + includeScript = includeDependencies { inherit dependencies; }; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; + + installPhase = '' + mkdir -p $out/${packageName} + cd $out/${packageName} + + source $includeScriptPath + + # Create fake package.json to make the npm commands work properly + cp ${src}/package.json . + chmod 644 package.json + ${lib.optionalString bypassCache '' + if [ -f ${src}/package-lock.json ] + then + cp ${src}/package-lock.json . + fi + ''} + + # Go to the parent folder to make sure that all packages are pinpointed + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Expose the executables that were installed + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + mv ${packageName} lib + ln -s $out/lib/node_modules/.bin $out/bin + ''; + } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + nodeDependencies = buildNodeDependencies args; + in + stdenv.mkDerivation { + name = "node-shell-${name}-${version}"; + + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/shell < Date: Tue, 18 May 2021 22:43:15 +0000 Subject: [PATCH 096/101] liblinphone: 4.5.1 -> 4.5.15 --- pkgs/development/libraries/liblinphone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix index 3ef64823a02..bc1fcc9f6a9 100644 --- a/pkgs/development/libraries/liblinphone/default.nix +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { pname = "liblinphone"; - version = "4.5.1"; + version = "4.5.15"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "05ybbxq2yqzy3f3vzq8c3szs3qr0zl64la53icpqnmfakwnps5gs"; + sha256 = "sha256-lDj2OkWuodPHpvoJ5W2GivzVIeMnprb42kAnJKfKtdg="; }; # Do not build static libraries From 70564a6853a321dcc52f18294ff6171e01aa3a5d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 19 May 2021 06:42:09 +0000 Subject: [PATCH 097/101] helmsman: 3.6.10 -> 3.6.11 --- pkgs/applications/networking/cluster/helmsman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index b223621d134..595dd3c61ae 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmsman"; - version = "3.6.10"; + version = "3.6.11"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-0Epff1NYfZXza27/5RBuICIj2455K31BGFr6PMLkNVE="; + sha256 = "sha256-9G/A6eADt9jP0CZC6MTZnQOmGOItJFI0zTfmC7HXSaI="; }; vendorSha256 = "sha256-icX8mOc8g+DhfAjD1pzneLWTXY17lXyAjdPOWAxkHwI="; From 520b4a84967bc9290da418ecf7e5f6d8eb159e74 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 15 May 2021 22:28:18 +0200 Subject: [PATCH 098/101] nixos: convert netatalk to settings-style configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also, set StateDirectory in systemd.….serviceConfig. --- .../services/network-filesystems/netatalk.nix | 135 ++++++------------ 1 file changed, 40 insertions(+), 95 deletions(-) diff --git a/nixos/modules/services/network-filesystems/netatalk.nix b/nixos/modules/services/network-filesystems/netatalk.nix index 33e851210bc..06a36eb30c2 100644 --- a/nixos/modules/services/network-filesystems/netatalk.nix +++ b/nixos/modules/services/network-filesystems/netatalk.nix @@ -3,43 +3,10 @@ with lib; let - cfg = config.services.netatalk; - - extmapFile = pkgs.writeText "extmap.conf" cfg.extmap; - - afpToString = x: if builtins.typeOf x == "bool" - then boolToString x - else toString x; - - volumeConfig = name: - let vol = getAttr name cfg.volumes; in - "[${name}]\n " + (toString ( - map - (key: "${key} = ${afpToString (getAttr key vol)}\n") - (attrNames vol) - )); - - afpConf = ''[Global] - extmap file = ${extmapFile} - afp port = ${toString cfg.port} - - ${cfg.extraConfig} - - ${if cfg.homes.enable then ''[Homes] - ${optionalString (cfg.homes.path != "") "path = ${cfg.homes.path}"} - basedir regex = ${cfg.homes.basedirRegex} - ${cfg.homes.extraConfig} - '' else ""} - - ${toString (map volumeConfig (attrNames cfg.volumes))} - ''; - - afpConfFile = pkgs.writeText "afp.conf" afpConf; - -in - -{ + settingsFormat = pkgs.formats.ini { }; + afpConfFile = settingsFormat.generate "afp.conf" cfg.settings; +in { options = { services.netatalk = { @@ -51,61 +18,24 @@ in description = "TCP port to be used for AFP."; }; - extraConfig = mkOption { - type = types.lines; - default = ""; - example = "uam list = uams_guest.so"; - description = '' - Lines of configuration to add to the [Global] section. - See man apf.conf for more information. - ''; - }; - - homes = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable sharing of the UNIX server user home directories."; - }; - - path = mkOption { - type = types.str; - default = ""; - example = "afp-data"; - description = "Share not the whole user home but this subdirectory path."; - }; - - basedirRegex = mkOption { - example = "/home"; - type = types.str; - description = "Regex which matches the parent directory of the user homes."; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Lines of configuration to add to the [Homes] section. - See man apf.conf for more information. - ''; - }; - }; - - volumes = mkOption { + settings = mkOption { + inherit (settingsFormat) type; default = { }; - type = types.attrsOf (types.attrsOf types.unspecified); - description = - '' - Set of AFP volumes to export. - See man apf.conf for more information. - ''; - example = literalExample '' - { srv = - { path = "/srv"; - "read only" = true; - "hosts allow" = "10.1.0.0/16 10.2.1.100 2001:0db8:1234::/48"; - }; - } + example = { + Global = { "uam list" = "uams_guest.so"; }; + Homes = { + path = "afp-data"; + "basedir regex" = "/home"; + }; + example-volume = { + path = "/srv/volume"; + "read only" = true; + }; + }; + description = '' + Configuration for Netatalk. See + afp.conf + 5. ''; }; @@ -114,18 +44,33 @@ in default = ""; description = '' File name extension mappings. - See man extmap.conf for more information. + See extmap.conf + 5. for more information. ''; }; }; }; + imports = (map (option: + mkRemovedOptionModule [ "services" "netatalk" option ] + "This option was removed in favor of `services.netatalk.settings`.") [ + "extraConfig" + "homes" + "volumes" + ]); + config = mkIf cfg.enable { + services.netatalk.settings.Global = { + "afp port" = toString cfg.port; + "extmap file" = "${pkgs.writeText "extmap.conf" cfg.extmap}"; + }; + systemd.services.netatalk = { description = "Netatalk AFP fileserver for Macintosh clients"; - unitConfig.Documentation = "man:afp.conf(5) man:netatalk(8) man:afpd(8) man:cnid_metad(8) man:cnid_dbd(8)"; + unitConfig.Documentation = + "man:afp.conf(5) man:netatalk(8) man:afpd(8) man:cnid_metad(8) man:cnid_dbd(8)"; after = [ "network.target" "avahi-daemon.service" ]; wantedBy = [ "multi-user.target" ]; @@ -135,12 +80,12 @@ in Type = "forking"; GuessMainPID = "no"; PIDFile = "/run/lock/netatalk"; - ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0755 -p /var/lib/netatalk/CNID"; - ExecStart = "${pkgs.netatalk}/sbin/netatalk -F ${afpConfFile}"; + ExecStart = "${pkgs.netatalk}/sbin/netatalk -F ${afpConfFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - ExecStop = "${pkgs.coreutils}/bin/kill -TERM $MAINPID"; + ExecStop = "${pkgs.coreutils}/bin/kill -TERM $MAINPID"; Restart = "always"; RestartSec = 1; + StateDirectory = [ "netatalk/CNID" ]; }; }; From e27062982ee11806a30f56a47a6cc9023832caf3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 19 May 2021 03:17:52 +0000 Subject: [PATCH 099/101] cava: 0.7.3 -> 0.7.4 --- pkgs/applications/audio/cava/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index d024128c821..b32eb1b627d 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "cava"; - version = "0.7.3"; + version = "0.7.4"; buildInputs = [ alsaLib @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "karlstav"; repo = "cava"; rev = version; - sha256 = "04j5hb29hivcbk542sfsx9m57dbnj2s6qpvy9fs488zvgjbgxrai"; + sha256 = "sha256-BlHGst34aUgQcXcuQG43VnKUTclCxfQmWRa6iCud8dc="; }; nativeBuildInputs = [ autoreconfHook ]; From 86cf41abc1537cdf258698d9a81dbd59eef61dc4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Apr 2021 17:16:20 +0000 Subject: [PATCH 100/101] onedrive: 2.4.10 -> 2.4.11 --- pkgs/applications/networking/sync/onedrive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index 300214e58b7..b7e9f220f00 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.10"; + version = "2.4.11"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - sha256 = "sha256:0dvxjkni66g82j9wr6yy07sn7d7yr7bbc0py89pxybvsbid88l65"; + sha256 = "sha256-ioOrkhVeHHqIjoEXcYo8ATJW+2+nZOehf3XbAJUEXpY="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; From 8aac6d8daf586ac6246e4233e00217258a738889 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 20 May 2021 14:24:11 +0800 Subject: [PATCH 101/101] linuxPackages.rtl8812au: add myself as maintainer, cleanup --- pkgs/os-specific/linux/rtl8812au/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index d0ec97b7c9a..43396a99b96 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -12,15 +12,17 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ bc nukeReferences ]; + buildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" "format" ]; prePatch = '' - substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/" - substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}" - substituteInPlace ./Makefile --replace /sbin/depmod \# - substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + substituteInPlace ./Makefile \ + --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ + --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ + --replace /sbin/depmod \# \ + --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; makeFlags = [ @@ -45,7 +47,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/gordboy/rtl8812au-5.9.3.2"; license = licenses.gpl2Only; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ fortuneteller2k ]; broken = kernel.kernelOlder "4.10" || kernel.isHardened; }; }