From 34f6106f66b00f65321c51af0c6714ed63e3866e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 09:12:46 +0100 Subject: [PATCH 001/104] python3Packages.aioflo: 2021.10.0 -> 2021.11.0 --- .../python-modules/aioflo/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/aioflo/default.nix b/pkgs/development/python-modules/aioflo/default.nix index d780f4963595..70b41a0af310 100644 --- a/pkgs/development/python-modules/aioflo/default.nix +++ b/pkgs/development/python-modules/aioflo/default.nix @@ -6,35 +6,42 @@ , poetry-core , pytest-aiohttp , pytest-asyncio -, pytest-cov , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "aioflo"; - version = "2021.10.0"; + version = "2021.11.0"; format = "pyproject"; + disabled = pythonOlder "3.6"; + src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-BunTgK8IS9uE8y/LMk7624kunouNAWNqe3Xm2DjQ1pY="; + sha256 = "sha256-7NrOoc1gi8YzZaKvCnHnzAKPlMnMhqxjdyZGN5H/8TQ="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; checkInputs = [ aresponses pytest-aiohttp pytest-asyncio - pytest-cov pytestCheckHook ]; - pythonImportsCheck = [ "aioflo" ]; + pythonImportsCheck = [ + "aioflo" + ]; meta = with lib; { description = "Python library for Flo by Moen Smart Water Detectors"; From 48ad2dfdb4eb88903f402ec4c315c3638ea2acb2 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Wed, 6 Jan 2021 12:00:00 +0000 Subject: [PATCH 002/104] paperwork: 2.0.3 -> 2.1.0 --- pkgs/applications/office/paperwork/openpaperwork-core.nix | 3 ++- pkgs/applications/office/paperwork/openpaperwork-gtk.nix | 1 + pkgs/applications/office/paperwork/paperwork-backend.nix | 8 ++++---- pkgs/applications/office/paperwork/src.nix | 8 ++++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/office/paperwork/openpaperwork-core.nix b/pkgs/applications/office/paperwork/openpaperwork-core.nix index cae55ae95f1c..9b6f352d97ac 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-core.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-core.nix @@ -2,7 +2,7 @@ , isPy3k, isPyPy -, distro, setuptools +, distro, setuptools, psutil , pkgs }: @@ -25,6 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ distro setuptools + psutil ]; nativeBuildInputs = [ pkgs.gettext pkgs.which ]; diff --git a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix index 5dae745ce2eb..4ddc0b4e2784 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { pygobject3 pkgs.poppler_gi pkgs.gtk3 + pkgs.libhandy distro pkgs.pango openpaperwork-core diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix index a033bd695db6..ad5e5a3b6d42 100644 --- a/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -6,7 +6,7 @@ , isPyPy , pyenchant -, simplebayes +, scikit-learn , pypillowfight , pycountry , whoosh @@ -41,7 +41,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyenchant - simplebayes + scikit-learn pypillowfight pycountry whoosh @@ -61,12 +61,12 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - nativeBuildInputs = [ pkgs.gettext pkgs.which ]; + nativeBuildInputs = [ pkgs.gettext pkgs.which pkgs.shared-mime-info ]; preBuild = '' make l10n_compile ''; - checkInputs = [ openpaperwork-gtk psutil ]; + checkInputs = [ openpaperwork-gtk psutil pkgs.libreoffice ]; meta = { description = "Backend part of Paperwork (Python API, no UI)"; diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index 72293ef3903f..a5141a43e502 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,13 +1,13 @@ {fetchFromGitLab}: rec { - version = "2.0.3"; + version = "2.1.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "02c2ysca75j59v87n1axqfncvs167kmdr40m0f05asdh2akwrbi9"; + sha256 = "0d1cw6k1giqs8ji8h3h97ckb134s8pszgip0nac5hmw0mvqq84xa"; }; sample_documents = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -15,8 +15,8 @@ rec { group = "World"; owner = "OpenPaperwork"; # https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/blob/master/paperwork-gtk/src/paperwork_gtk/model/help/screenshot.sh see TEST_DOCS_TAG - rev = "1.0"; - sha256 = "155nhw2jmlgfi6c3wm241vrr3yma6lw85k9lxn844z96kyi7wbpr"; + rev = "2.1"; + sha256 = "0m79fgc1ycsj0q0alqgr0axn16klz1sfs2km1h83zn3kysqcs6xr"; }; } From d4f617aa730a402ed721bcfe4d4619a395b45ae4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 09:58:45 +0000 Subject: [PATCH 003/104] meshcentral: 0.9.50 -> 0.9.56 --- pkgs/tools/admin/meshcentral/default.nix | 4 +- pkgs/tools/admin/meshcentral/package.json | 3 +- pkgs/tools/admin/meshcentral/yarn.lock | 148 +++++++++-------- pkgs/tools/admin/meshcentral/yarn.nix | 184 ++++++++++++---------- 4 files changed, 186 insertions(+), 153 deletions(-) diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index b149c1441395..0b397b541e53 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -1,11 +1,11 @@ { lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs, jq, dos2unix }: yarn2nix-moretea.mkYarnPackage rec { - version = "0.9.50"; + version = "0.9.56"; src = fetchzip { url = "https://registry.npmjs.org/meshcentral/-/meshcentral-${version}.tgz"; - sha256 = "0igkl2ip2mas3djg1rmw209xar1kfiqy277r2lzi5zcnn4hh820m"; + sha256 = "0yjl931yfn2cz60gh00wyv5zxzqmw9s0r4nf1friqhxs37055278"; }; packageJSON = ./package.json; diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json index 119a3f2b5d17..7d92ea8606d6 100644 --- a/pkgs/tools/admin/meshcentral/package.json +++ b/pkgs/tools/admin/meshcentral/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.9.50", + "version": "0.9.56", "keywords": [ "Remote Device Management", "Remote Device Monitoring", @@ -117,6 +117,7 @@ "otplib": "10.2.3", "twilio": "*", "plivo": "*", + "telnyx": "*", "web-push": "*", "node-xcs": "*", "modern-syslog": "*", diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock index cba8028834b9..96e80b306bfd 100644 --- a/pkgs/tools/admin/meshcentral/yarn.lock +++ b/pkgs/tools/admin/meshcentral/yarn.lock @@ -63,9 +63,9 @@ js-tokens "^4.0.0" "@babel/parser@^7.16.0", "@babel/parser@^7.16.3", "@babel/parser@^7.4.3": - version "7.16.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.3.tgz#271bafcb811080905a119222edbc17909c82261d" - integrity sha512-dcNwU1O4sx57ClvLBVFbEgx0UZWfd0JQX5X6fxFRCLHelFBGXFfSz6Y0FAq2PEwUqlqLkdVjVr4VASEOuUnLJw== + version "7.16.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.4.tgz#d5f92f57cf2c74ffe9b37981c0e72fee7311372e" + integrity sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng== "@babel/template@^7.16.0", "@babel/template@^7.4.0": version "7.16.0" @@ -148,14 +148,14 @@ "@types/node" "*" "@types/node@*": - version "16.11.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.7.tgz#36820945061326978c42a01e56b61cd223dfdc42" - integrity sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw== + version "16.11.11" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.11.tgz#6ea7342dfb379ea1210835bada87b3c512120234" + integrity sha512-KB0sixD67CeecHC33MYn+eYARkqTheIRNuu97y2XMjR7Wu3XibO1vaY6VBV6O/a89SPI81cEUIYT87UqUWlZNw== "@types/node@^14.14.14", "@types/node@^14.14.28": - version "14.17.33" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.33.tgz#011ee28e38dc7aee1be032ceadf6332a0ab15b12" - integrity sha512-noEeJ06zbn3lOh4gqe2v7NMGS33jrulfNqYFDjjEbhpDEHR5VTxgYNQSBqBlJIsBJW3uEYDgD6kvMnrrhGzq8g== + version "14.18.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.0.tgz#98df2397f6936bfbff4f089e40e06fa5dd88d32a" + integrity sha512-0GeIl2kmVMXEnx8tg1SlG6Gg8vkqirrW752KqolYo1PHevhhZN3bhJ67qHj+bQaINhX0Ra3TlWwRvMCd9iEfNQ== "@types/webidl-conversions@*": version "6.1.1" @@ -473,9 +473,9 @@ acorn@^7.1.1: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2" - integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q== + version "8.6.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895" + integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw== aedes-packet@^1.0.0: version "1.0.0" @@ -1526,9 +1526,9 @@ bson@^1.1.4: integrity sha512-EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg== bson@^4.4.0: - version "4.5.4" - resolved "https://registry.yarnpkg.com/bson/-/bson-4.5.4.tgz#5f74f1e11f743ea8aec30b5e24bfddae82846873" - integrity sha512-wIt0bPACnx8Ju9r6IsS2wVtGDHBr9Dxb+U29A1YED2pu8XOhS8aKjOnLZ8sxyXkPwanoK7iWWVhS1+coxde6xA== + version "4.6.0" + resolved "https://registry.yarnpkg.com/bson/-/bson-4.6.0.tgz#15c3b39ba3940c3d915a0c44d51459f4b4fbf1b2" + integrity sha512-8jw1NU1hglS+Da1jDOUYuNcBJ4cNHCFIqzlwoFNnsTOg2R/ox0aTYcTiBN4dzRa9q7Cvy6XErh3L8ReTEb9AQQ== dependencies: buffer "^5.6.0" @@ -2255,9 +2255,9 @@ debug@3.1.0: ms "2.0.0" debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + version "4.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== dependencies: ms "2.1.2" @@ -3157,9 +3157,9 @@ globals@^9.18.0: integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== google-auth-library@^7.0.2: - version "7.10.2" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.10.2.tgz#7e48176f50e725e1d65b6a838ec9e9464e6ba689" - integrity sha512-M37o9Kxa/TLvOLgF71SXvLeVEP5sbSTmKl1zlIgl72SFy5PtsU3pOdu8G8MIHHpQ3/NZabDI8rQkA9DvQVKkPA== + version "7.10.3" + resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.10.3.tgz#e553683315b3095eebef3a8c019c09446cb75a3c" + integrity sha512-VBwUCrjR+/p/J4ifSZRXG0XEc3Cm+2xnFrJi3A9DC2GzbCUK5j+R6CfqS7jyu1Hureb1PV53ZXZS1QV9PYUCrw== dependencies: arrify "^2.0.0" base64-js "^1.3.0" @@ -3196,9 +3196,9 @@ googleapis-common@^5.0.2: uuid "^8.0.0" googleapis@*: - version "91.0.0" - resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-91.0.0.tgz#c5e51ca568ed687f0694a082237c7b7b96a19b3b" - integrity sha512-iHqXZwgYam0g8n0Yyi+YHx8kgwT+H5O4k3fe0LB1JhWRp1dSKYu+ShY4PQbW584zLOE4kK3LHf2B+x1THx+ZPQ== + version "92.0.0" + resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-92.0.0.tgz#291b9826a5a4509a9e9a6974ef942328857bfe18" + integrity sha512-5HgJg7XvqEEJ+GO+2gvnzd5cAcDuSS/VB6nW7thoyj2GMq9nH4VvJwncSevinjLCnv06a+VSxrXNiL5vePHojA== dependencies: google-auth-library "^7.0.2" googleapis-common "^5.0.2" @@ -4077,9 +4077,9 @@ jsdoc2md-stats@^1.0.3: feature-detect-es6 "^1.3.1" jsdom@*: - version "18.1.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-18.1.0.tgz#43e88a0e4d6d2aeeec0a18810c0934c02b2ae3e4" - integrity sha512-q6QFAfSGLEUqRJ+GCV6vn6ItZCMARWh1d33wiJZPxc+wMNw7HK71JPmQ4C2lIZAsBH8TiJu4uplach/UcrC6bQ== + version "19.0.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-19.0.0.tgz#93e67c149fe26816d38a849ea30ac93677e16b6a" + integrity sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A== dependencies: abab "^2.0.5" acorn "^8.5.0" @@ -4141,10 +4141,10 @@ json-schema-traverse@^0.4.1: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= +json-schema@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5" + integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA== json-stringify-safe@~5.0.1: version "5.0.1" @@ -4173,13 +4173,13 @@ jsonwebtoken@^8.5.1: semver "^5.6.0" jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= + version "1.4.2" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb" + integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw== dependencies: assert-plus "1.0.0" extsprintf "1.3.0" - json-schema "0.2.3" + json-schema "0.4.0" verror "1.10.0" jwa@^1.4.1: @@ -4998,9 +4998,9 @@ node-xcs@*: "@xmpp/debug" "^0.9.2" nodemailer@*: - version "6.7.1" - resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.1.tgz#09f72f8b375f7b259291757007bcd902c0174c6e" - integrity sha512-E1C8G3rnXrGjznwGP1k+OrW5k4rl0XtqTEB19f7vtJAMYwfxZVSsAu2iY5xJkrZsbVYr6PwwAwRmFlakPoFC0A== + version "6.7.2" + resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.2.tgz#44b2ad5f7ed71b7067f7a21c4fedabaec62b85e0" + integrity sha512-Dz7zVwlef4k5R71fdmxwR8Q39fiboGbu3xgswkzGwczUfjp873rVxt1O46+Fh0j1ORnAC6L9+heI8uUpO6DT7Q== nofilter@^1.0.4: version "1.0.4" @@ -5115,9 +5115,9 @@ object-get@^2.0.0, object-get@^2.0.2, object-get@^2.1.0: integrity sha512-7n4IpLMzGGcLEMiQKsNR7vCe+N5E9LORFrtNUVy4sO3dj9a3HedZCxEL2T7QuLhcHN1NBuBsMOKaOsAYI9IIvg== object-inspect@^1.9.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" - integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== + version "1.11.1" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.1.tgz#d4bd7d7de54b9a75599f59a00bd698c1f1c6549b" + integrity sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA== object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" @@ -5676,9 +5676,9 @@ please-upgrade-node@^3.2.0: semver-compare "^1.0.0" plivo@*: - version "4.23.1" - resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.23.1.tgz#bbc680db39a2c539288ae317fcb19dcdf00edcac" - integrity sha512-q8I3rcT7/4a+u650i6RzBYJ2v5uDFSfjnAd/FAJ6Wlj9guWA9zoJTdAsk4FhlKkkwvczxS6UigIqI3DORzM8OA== + version "4.25.0" + resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.25.0.tgz#ba496e0e75dcbe5747d5770e6e07fd9eb153d7dd" + integrity sha512-pe3Frvgpk5ks5DwTbUN9DJTNIw2pV2Yip8DXfmBW34SCPdxyXUqsAw8TurDEjxTWEIuck4e4JizpQyv/V9T2tg== dependencies: "@types/node" "^14.14.14" axios "^0.21.1" @@ -5830,10 +5830,10 @@ qs@6.7.0: resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== -qs@^6.7.0, qs@^6.9.4: - version "6.10.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a" - integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg== +qs@^6.6.0, qs@^6.7.0, qs@^6.9.4: + version "6.10.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.2.tgz#c1431bea37fc5b24c5bdbafa20f16bdf2a4b9ffe" + integrity sha512-mSIdjzqznWgfd4pMii7sHtaYF8rx8861hBO80SraY5GT0XQibWZWJSid0avzHGkDIZLImux2S5mXO0Hfct2QCw== dependencies: side-channel "^1.0.4" @@ -6462,9 +6462,9 @@ side-channel@^1.0.4: object-inspect "^1.9.0" signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.5" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" - integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== + version "3.0.6" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" + integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== slash@^1.0.0: version "1.0.0" @@ -6767,9 +6767,9 @@ strip-json-comments@~2.0.1: integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= strnum@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.4.tgz#e97e36a7d6ba9f93d0d6b496b2ed0678d422832b" - integrity sha512-lMzNMfDpaQOLt4B2mEbfzYS0+T7dvCXeojnlGf6f1AygvWDMcWyXYaLbyICfjVu29sErR8fnRagQfBW/N/hGgw== + version "1.0.5" + resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz#5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db" + integrity sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA== supports-color@^2.0.0: version "2.0.0" @@ -6835,6 +6835,17 @@ tar-stream@^2.1.2, tar-stream@^2.2.0: inherits "^2.0.3" readable-stream "^3.1.1" +telnyx@*: + version "1.23.0" + resolved "https://registry.yarnpkg.com/telnyx/-/telnyx-1.23.0.tgz#0d949a11f7c819b0d5ce8ae8c36b80bd02e351c8" + integrity sha512-hmXxXVyj+Fi+ips7KwmgUYQrzHCIyGo8bjm/B8tsCAJ7PZ0V3LO330CVOk0gPdlcZxIkITaXWB51swrbK09Wew== + dependencies: + lodash.isplainobject "^4.0.6" + qs "^6.6.0" + safe-buffer "^5.1.1" + tweetnacl "^1.0.1" + uuid "^3.3.2" + temp-path@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/temp-path/-/temp-path-1.0.0.tgz#24b1543973ab442896d9ad367dd9cbdbfafe918b" @@ -7019,10 +7030,15 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= +tweetnacl@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596" + integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== + twilio@*: - version "3.71.1" - resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.71.1.tgz#15bbb4b51c75d91cc07a8149378c4af330e543cc" - integrity sha512-P/KFvm33UW15EnpHJKgdTxUa1u6MlR/u+sCVnL4ie2TDRv6t7kX+ieIGQMpH7bP/z7FXkTjEt0lz4M+XJ/XWOg== + version "3.71.3" + resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.71.3.tgz#a446d2b49f8c1ed60b0dd830c919921358c17203" + integrity sha512-m9eda9fvkHxMMDHRtXj8WKI0ViP4EG4xS5au5ay3ScfModhBZ1ZtyfWZ0AfWI++A7a1T1j3ZVNIZ+AMLwxSffw== dependencies: axios "^0.21.4" dayjs "^1.8.29" @@ -7067,9 +7083,9 @@ uglify-js@^2.6: uglify-to-browserify "~1.0.0" uglify-js@^3.1.4, uglify-js@^3.5.1: - version "3.14.3" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.3.tgz#c0f25dfea1e8e5323eccf59610be08b6043c15cf" - integrity sha512-mic3aOdiq01DuSVx0TseaEzMIVqebMZ0Z3vaeDhFEh9bsc24hV1TFvN74reA2vs08D0ZWfNjAcJ3UbVLaBss+g== + version "3.14.4" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.4.tgz#68756f17d1b90b9d289341736cb9a567d6882f90" + integrity sha512-AbiSR44J0GoCeV81+oxcy/jDOElO2Bx3d0MfQCUShq7JRXaM4KtQopZsq2vFv8bCq2yMaGrw1FgygUd03RyRDA== uglify-to-browserify@~1.0.0: version "1.0.2" @@ -7527,14 +7543,14 @@ ws@5.2.3, ws@^5.2.0: async-limiter "~1.0.0" ws@^7.0.0: - version "7.5.5" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881" - integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w== + version "7.5.6" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b" + integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA== ws@^8.2.3: - version "8.2.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" - integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== + version "8.3.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.3.0.tgz#7185e252c8973a60d57170175ff55fdbd116070d" + integrity sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw== xml-crypto@^2.1.3: version "2.1.3" diff --git a/pkgs/tools/admin/meshcentral/yarn.nix b/pkgs/tools/admin/meshcentral/yarn.nix index 171abf0fd254..fd4fe90755b5 100644 --- a/pkgs/tools/admin/meshcentral/yarn.nix +++ b/pkgs/tools/admin/meshcentral/yarn.nix @@ -66,11 +66,11 @@ }; } { - name = "_babel_parser___parser_7.16.3.tgz"; + name = "_babel_parser___parser_7.16.4.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.16.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.3.tgz"; - sha1 = "271bafcb811080905a119222edbc17909c82261d"; + name = "_babel_parser___parser_7.16.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.4.tgz"; + sha1 = "d5f92f57cf2c74ffe9b37981c0e72fee7311372e"; }; } { @@ -154,19 +154,19 @@ }; } { - name = "_types_node___node_16.11.7.tgz"; + name = "_types_node___node_16.11.11.tgz"; path = fetchurl { - name = "_types_node___node_16.11.7.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.7.tgz"; - sha1 = "36820945061326978c42a01e56b61cd223dfdc42"; + name = "_types_node___node_16.11.11.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.11.tgz"; + sha1 = "6ea7342dfb379ea1210835bada87b3c512120234"; }; } { - name = "_types_node___node_14.17.33.tgz"; + name = "_types_node___node_14.18.0.tgz"; path = fetchurl { - name = "_types_node___node_14.17.33.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.33.tgz"; - sha1 = "011ee28e38dc7aee1be032ceadf6332a0ab15b12"; + name = "_types_node___node_14.18.0.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.0.tgz"; + sha1 = "98df2397f6936bfbff4f089e40e06fa5dd88d32a"; }; } { @@ -506,11 +506,11 @@ }; } { - name = "acorn___acorn_8.5.0.tgz"; + name = "acorn___acorn_8.6.0.tgz"; path = fetchurl { - name = "acorn___acorn_8.5.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz"; - sha1 = "4512ccb99b3698c752591e9bb4472e38ad43cee2"; + name = "acorn___acorn_8.6.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz"; + sha1 = "e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895"; }; } { @@ -1530,11 +1530,11 @@ }; } { - name = "bson___bson_4.5.4.tgz"; + name = "bson___bson_4.6.0.tgz"; path = fetchurl { - name = "bson___bson_4.5.4.tgz"; - url = "https://registry.yarnpkg.com/bson/-/bson-4.5.4.tgz"; - sha1 = "5f74f1e11f743ea8aec30b5e24bfddae82846873"; + name = "bson___bson_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/bson/-/bson-4.6.0.tgz"; + sha1 = "15c3b39ba3940c3d915a0c44d51459f4b4fbf1b2"; }; } { @@ -2282,11 +2282,11 @@ }; } { - name = "debug___debug_4.3.2.tgz"; + name = "debug___debug_4.3.3.tgz"; path = fetchurl { - name = "debug___debug_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; - sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; + name = "debug___debug_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz"; + sha1 = "04266e0b70a98d4462e6e288e38259213332b664"; }; } { @@ -3274,11 +3274,11 @@ }; } { - name = "google_auth_library___google_auth_library_7.10.2.tgz"; + name = "google_auth_library___google_auth_library_7.10.3.tgz"; path = fetchurl { - name = "google_auth_library___google_auth_library_7.10.2.tgz"; - url = "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.10.2.tgz"; - sha1 = "7e48176f50e725e1d65b6a838ec9e9464e6ba689"; + name = "google_auth_library___google_auth_library_7.10.3.tgz"; + url = "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.10.3.tgz"; + sha1 = "e553683315b3095eebef3a8c019c09446cb75a3c"; }; } { @@ -3306,11 +3306,11 @@ }; } { - name = "googleapis___googleapis_91.0.0.tgz"; + name = "googleapis___googleapis_92.0.0.tgz"; path = fetchurl { - name = "googleapis___googleapis_91.0.0.tgz"; - url = "https://registry.yarnpkg.com/googleapis/-/googleapis-91.0.0.tgz"; - sha1 = "c5e51ca568ed687f0694a082237c7b7b96a19b3b"; + name = "googleapis___googleapis_92.0.0.tgz"; + url = "https://registry.yarnpkg.com/googleapis/-/googleapis-92.0.0.tgz"; + sha1 = "291b9826a5a4509a9e9a6974ef942328857bfe18"; }; } { @@ -4282,11 +4282,11 @@ }; } { - name = "jsdom___jsdom_18.1.0.tgz"; + name = "jsdom___jsdom_19.0.0.tgz"; path = fetchurl { - name = "jsdom___jsdom_18.1.0.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-18.1.0.tgz"; - sha1 = "43e88a0e4d6d2aeeec0a18810c0934c02b2ae3e4"; + name = "jsdom___jsdom_19.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-19.0.0.tgz"; + sha1 = "93e67c149fe26816d38a849ea30ac93677e16b6a"; }; } { @@ -4338,11 +4338,11 @@ }; } { - name = "json_schema___json_schema_0.2.3.tgz"; + name = "json_schema___json_schema_0.4.0.tgz"; path = fetchurl { - name = "json_schema___json_schema_0.2.3.tgz"; - url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + name = "json_schema___json_schema_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz"; + sha1 = "f7de4cf6efab838ebaeb3236474cbba5a1930ab5"; }; } { @@ -4370,11 +4370,11 @@ }; } { - name = "jsprim___jsprim_1.4.1.tgz"; + name = "jsprim___jsprim_1.4.2.tgz"; path = fetchurl { - name = "jsprim___jsprim_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + name = "jsprim___jsprim_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz"; + sha1 = "712c65533a15c878ba59e9ed5f0e26d5b77c5feb"; }; } { @@ -5290,11 +5290,11 @@ }; } { - name = "nodemailer___nodemailer_6.7.1.tgz"; + name = "nodemailer___nodemailer_6.7.2.tgz"; path = fetchurl { - name = "nodemailer___nodemailer_6.7.1.tgz"; - url = "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.1.tgz"; - sha1 = "09f72f8b375f7b259291757007bcd902c0174c6e"; + name = "nodemailer___nodemailer_6.7.2.tgz"; + url = "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.2.tgz"; + sha1 = "44b2ad5f7ed71b7067f7a21c4fedabaec62b85e0"; }; } { @@ -5410,11 +5410,11 @@ }; } { - name = "object_inspect___object_inspect_1.11.0.tgz"; + name = "object_inspect___object_inspect_1.11.1.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz"; - sha1 = "9dceb146cedd4148a0d9e51ab88d34cf509922b1"; + name = "object_inspect___object_inspect_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.1.tgz"; + sha1 = "d4bd7d7de54b9a75599f59a00bd698c1f1c6549b"; }; } { @@ -6058,11 +6058,11 @@ }; } { - name = "plivo___plivo_4.23.1.tgz"; + name = "plivo___plivo_4.25.0.tgz"; path = fetchurl { - name = "plivo___plivo_4.23.1.tgz"; - url = "https://registry.yarnpkg.com/plivo/-/plivo-4.23.1.tgz"; - sha1 = "bbc680db39a2c539288ae317fcb19dcdf00edcac"; + name = "plivo___plivo_4.25.0.tgz"; + url = "https://registry.yarnpkg.com/plivo/-/plivo-4.25.0.tgz"; + sha1 = "ba496e0e75dcbe5747d5770e6e07fd9eb153d7dd"; }; } { @@ -6258,11 +6258,11 @@ }; } { - name = "qs___qs_6.10.1.tgz"; + name = "qs___qs_6.10.2.tgz"; path = fetchurl { - name = "qs___qs_6.10.1.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz"; - sha1 = "4931482fa8d647a5aab799c5271d2133b981fb6a"; + name = "qs___qs_6.10.2.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.10.2.tgz"; + sha1 = "c1431bea37fc5b24c5bdbafa20f16bdf2a4b9ffe"; }; } { @@ -6962,11 +6962,11 @@ }; } { - name = "signal_exit___signal_exit_3.0.5.tgz"; + name = "signal_exit___signal_exit_3.0.6.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz"; - sha1 = "9e3e8cc0c75a99472b44321033a7702e7738252f"; + name = "signal_exit___signal_exit_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz"; + sha1 = "24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"; }; } { @@ -7306,11 +7306,11 @@ }; } { - name = "strnum___strnum_1.0.4.tgz"; + name = "strnum___strnum_1.0.5.tgz"; path = fetchurl { - name = "strnum___strnum_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/strnum/-/strnum-1.0.4.tgz"; - sha1 = "e97e36a7d6ba9f93d0d6b496b2ed0678d422832b"; + name = "strnum___strnum_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz"; + sha1 = "5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db"; }; } { @@ -7385,6 +7385,14 @@ sha1 = "acad84c284136b060dc3faa64474aa9aebd77287"; }; } + { + name = "telnyx___telnyx_1.23.0.tgz"; + path = fetchurl { + name = "telnyx___telnyx_1.23.0.tgz"; + url = "https://registry.yarnpkg.com/telnyx/-/telnyx-1.23.0.tgz"; + sha1 = "0d949a11f7c819b0d5ce8ae8c36b80bd02e351c8"; + }; + } { name = "temp_path___temp_path_1.0.0.tgz"; path = fetchurl { @@ -7610,11 +7618,19 @@ }; } { - name = "twilio___twilio_3.71.1.tgz"; + name = "tweetnacl___tweetnacl_1.0.3.tgz"; path = fetchurl { - name = "twilio___twilio_3.71.1.tgz"; - url = "https://registry.yarnpkg.com/twilio/-/twilio-3.71.1.tgz"; - sha1 = "15bbb4b51c75d91cc07a8149378c4af330e543cc"; + name = "tweetnacl___tweetnacl_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz"; + sha1 = "ac0af71680458d8a6378d0d0d050ab1407d35596"; + }; + } + { + name = "twilio___twilio_3.71.3.tgz"; + path = fetchurl { + name = "twilio___twilio_3.71.3.tgz"; + url = "https://registry.yarnpkg.com/twilio/-/twilio-3.71.3.tgz"; + sha1 = "a446d2b49f8c1ed60b0dd830c919921358c17203"; }; } { @@ -7650,11 +7666,11 @@ }; } { - name = "uglify_js___uglify_js_3.14.3.tgz"; + name = "uglify_js___uglify_js_3.14.4.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.14.3.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.3.tgz"; - sha1 = "c0f25dfea1e8e5323eccf59610be08b6043c15cf"; + name = "uglify_js___uglify_js_3.14.4.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.4.tgz"; + sha1 = "68756f17d1b90b9d289341736cb9a567d6882f90"; }; } { @@ -8210,19 +8226,19 @@ }; } { - name = "ws___ws_7.5.5.tgz"; + name = "ws___ws_7.5.6.tgz"; path = fetchurl { - name = "ws___ws_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz"; - sha1 = "8b4bc4af518cfabd0473ae4f99144287b33eb881"; + name = "ws___ws_7.5.6.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz"; + sha1 = "e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"; }; } { - name = "ws___ws_8.2.3.tgz"; + name = "ws___ws_8.3.0.tgz"; path = fetchurl { - name = "ws___ws_8.2.3.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz"; - sha1 = "63a56456db1b04367d0b721a0b80cae6d8becbba"; + name = "ws___ws_8.3.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.3.0.tgz"; + sha1 = "7185e252c8973a60d57170175ff55fdbd116070d"; }; } { From 590509ab88d17ba103ca3f77120768d69b8fcb7b Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Mon, 6 Dec 2021 18:41:26 -0300 Subject: [PATCH 004/104] k6: 0.31.1 -> 0.35.0 --- pkgs/development/tools/k6/default.nix | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index b311ce4deacb..82ae89a699e3 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -1,25 +1,31 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "k6"; - version = "0.31.1"; - - goPackagePath = "github.com/loadimpact/k6"; + version = "0.35.0"; src = fetchFromGitHub { - owner = "loadimpact"; + owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wngOG0uSNoUU+88oShDpCgPpzuevzJxcwzSzWS3PzAw="; + sha256 = "sha256-mSVU/0OdlEfGWxO6Gn/Ji7k2pMO5jWTfxFujN08bZjU="; }; subPackages = [ "./" ]; + vendorSha256 = null; + + doCheck = true; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/k6 version | grep ${version} > /dev/null + ''; + meta = with lib; { description = "A modern load testing tool, using Go and JavaScript"; homepage = "https://k6.io/"; - changelog = "https://github.com/loadimpact/k6/releases/tag/v${version}"; + changelog = "https://github.com/grafana/k6/releases/tag/v${version}"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline bryanasdev000 ]; }; } From 4ee3f90c32570cfd9f0cba6791f6e0614251c3f6 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 7 Dec 2021 03:47:22 +0000 Subject: [PATCH 005/104] memtest86-efi: 8.4 -> 9.3.1000 --- pkgs/tools/misc/memtest86-efi/default.nix | 30 +++++++---------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/tools/misc/memtest86-efi/default.nix index 125f8f35acca..264fe013b27a 100644 --- a/pkgs/tools/misc/memtest86-efi/default.nix +++ b/pkgs/tools/misc/memtest86-efi/default.nix @@ -8,23 +8,13 @@ stdenv.mkDerivation rec { pname = "memtest86-efi"; - version = "8.4"; + version = "9.3.1000"; src = fetchzip { - # TODO: We're using the previous version of memtest86 because the - # company developing memtest86 has stopped providing a versioned download - # link for the latest version: - # - # https://www.passmark.com/forum/memtest86/44494-version-8-1-distribution-file-is-not-versioned?p=44505#post44505 - # - # However, versioned links for the previous version are available, so that - # is what is being used. - # - # It does look like redistribution is okay, so if we had somewhere to host - # binaries that we make sure to version, then we could probably keep up - # with the latest versions released by the company. - url = "https://www.memtest86.com/downloads/memtest86-${version}-usb.zip"; - sha256 = "sha256-jh4FKCYZbOQhRv6B7N8Hmw6RQCQvbBGaGFTMLwM1nk8="; + # We're using the Internet Archive Wayback Machine because the company developing MemTest86 has stopped providing a versioned download link for the latest version: + # https://forums.passmark.com/memtest86/44494-version-8-1-distribution-file-is-not-versioned + url = "https://web.archive.org/web/20211111004725/https://www.memtest86.com/downloads/memtest86-usb.zip"; + sha256 = "sha256-GJdZCUFw1uX4HcaaAy5QqDGNqHTFtrqla13wF7xCAaM="; stripRoot = false; }; @@ -57,18 +47,16 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://memtest86.com/"; + homepage = "https://www.memtest86.com/"; downloadPage = "https://www.memtest86.com/download.htm"; + changelog = "https://www.memtest86.com/whats-new.html"; description = "A tool to detect memory errors, to be run from a bootloader"; longDescription = '' A UEFI app that is able to detect errors in RAM. It can be run from a bootloader. Released under a proprietary freeware license. ''; - # The Memtest86 License for the Free Edition states, - # "MemTest86 Free Edition is free to download with no restrictions on usage". - # However the source code for Memtest86 does not appear to be available. - # - # https://www.memtest86.com/license.htm + # MemTest86 Free Edition is free to download with no restrictions on usage. However, the source code is not available. + # https://www.memtest86.com/tech_license-information.html license = licenses.unfreeRedistributable; maintainers = with maintainers; [ cdepillabout ]; platforms = platforms.linux; From c27e7861b01c3b4a2162949d80e2f96816609279 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 9 Dec 2021 00:08:41 +0100 Subject: [PATCH 006/104] ntk: 1.3.1000 -> 1.3.1001 switch from python2 to python3 --- pkgs/development/libraries/audio/ntk/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index ecb0215a2287..d101e2a960c6 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python2, wafHook }: +{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "ntk"; - version = "1.3.1000"; + version = "1.3.1001"; src = fetchFromGitHub { - owner = "original-male"; + owner = "linuxaudio"; repo = "ntk"; rev = "v${version}"; - sha256 = "0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0"; + sha256 = "sha256-NyEdg6e+9CI9V+TIgdpPyH1ei+Vq8pUxD3wPzWY5fEU="; }; nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ - cairo libjpeg libXft python2 + cairo libjpeg libXft python3 ]; meta = { From 6cda42cff98157944f8a418a03c5891f8130341b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Dec 2021 09:38:41 +0000 Subject: [PATCH 007/104] ne: 3.3.0 -> 3.3.1 --- pkgs/applications/editors/ne/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix index 172b30dbb0ff..b97b3eb79bb9 100644 --- a/pkgs/applications/editors/ne/default.nix +++ b/pkgs/applications/editors/ne/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ne"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "vigna"; repo = pname; rev = version; - sha256 = "01aglnsfljlvx0wvyvpjfn4y88jf450a06qnj9a8lgdqv1hdkq1a"; + sha256 = "sha256-75xsZ9X6nmRj0VVZmY1AeEOBtO2d7jbanZIZ3Klx4mk="; }; postPatch = '' From 8c9bfc63aa287b8df436f607a72673c8d91b48b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Dec 2021 13:59:07 +0000 Subject: [PATCH 008/104] mujs: 1.1.2 -> 1.1.3 --- pkgs/development/interpreters/mujs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index 46f86f85fc3a..d4f61781c80e 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mujs"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { url = "https://mujs.com/downloads/mujs-${version}.tar.xz"; - sha256 = "sha256-cZ6IK7fZhkDvoWM4Hpto7xzjXIekIuKqQZDJ5AIlh10="; + sha256 = "sha256-TSTpUJqea9I9fKFh0Kggvml+fmFD2aVx+tdUGyIcIKY="; }; buildInputs = [ readline ]; From b17661325374f483394f899ca41a4f0f465d3f69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Dec 2021 16:43:52 +0000 Subject: [PATCH 009/104] man-pages: 5.12 -> 5.13 --- pkgs/data/documentation/man-pages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 79a48acd9f24..60a7e3f229f5 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "man-pages"; - version = "5.12"; + version = "5.13"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz"; - sha256 = "07ip4f70nyxn24wy0fin6klq1hm1cjjvzr9zh5baqzssl1hckxbs"; + sha256 = "sha256-YU2uPv59/UgJhnY6KiqBeSFQMqWkUmwL5eiZol8Ja4s="; }; makeFlags = [ "prefix=$(out)" ]; From 55519305f0ca3e5ce30982192921f6c1f2af6589 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Dec 2021 17:30:03 +0000 Subject: [PATCH 010/104] libstatgrab: 0.92 -> 0.92.1 --- pkgs/development/libraries/libstatgrab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index 5daf93b943ba..d2a94d7168a8 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libstatgrab"; - version = "0.92"; + version = "0.92.1"; src = fetchurl { url = "https://ftp.i-scream.org/pub/i-scream/libstatgrab/${pname}-${version}.tar.gz"; - sha256 = "15m1sl990l85ijf8pnc6hdfha6fqyiq74mijrzm3xz4zzxm91wav"; + sha256 = "sha256-VoiqSmhVR9cXSoo3PqnY7pJ+dm48wwK97jRSPCxdbBE="; }; buildInputs = lib.optional stdenv.isDarwin IOKit; From d3bbb3b0b5b8b6b299fdd4c39c60926e4c47a332 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Dec 2021 20:23:48 +0000 Subject: [PATCH 011/104] marker: 2020.04.04 -> 2020.04.04.2 --- pkgs/applications/editors/marker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/marker/default.nix b/pkgs/applications/editors/marker/default.nix index f974cc1ef42c..c6779b8fba87 100644 --- a/pkgs/applications/editors/marker/default.nix +++ b/pkgs/applications/editors/marker/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { pname = "marker"; - version = "2020.04.04"; + version = "2020.04.04.2"; src = fetchFromGitHub { owner = "fabiocolacio"; repo = "Marker"; rev = version; fetchSubmodules = true; - sha256 = "1iy7izyprf050bix8am1krqivgyxnhx3jm775v8f80cgbqxy7m5r"; + sha256 = "sha256-wLR1FQqlLA02ed/JoAcxRHhIVua1FibAee1PC2zOPOM="; }; nativeBuildInputs = [ From a1fa86e69183e204c2be4672e21572195cd0ad86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Dec 2021 10:13:57 +0000 Subject: [PATCH 012/104] jmol: 14.31.49 -> 14.32.2 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index a3add93c8f70..b379439916f9 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.49"; + version = "14.32.2"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-P+bzimBVammX5LxE6Yd6CmvmBeG8WdyA1T9bHXd+ifI="; + sha256 = "sha256-JETS1mxlDyWPC8ngtmYujmfWIdrW9HzkqpX/VZpIMBE="; }; patchPhase = '' From 875ea5d71bc28581dacd84edf49c71f44ee98a15 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 10 Dec 2021 14:17:56 +0100 Subject: [PATCH 013/104] libsidplayfp: fix tests on x86_64-darwin --- pkgs/development/libraries/libsidplayfp/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 6e1319dda24f..50e6d8846f23 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , nix-update-script , autoreconfHook , pkg-config @@ -26,6 +27,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-Cu5mZzsqAO4X4Y8QAn851zIFPVPwxj5pB+jvA62L108="; }; + patches = [ + # Fixes test failure on x86_64-darwin + # Drop when fix for https://github.com/libsidplayfp/libsidplayfp/issues/39 in a release (>2.3.1) + (fetchpatch { + url = "https://github.com/libsidplayfp/libsidplayfp/commit/337020a91caa0113de4f4374e0dc770e4056d2c7.patch"; + sha256 = "0sd7bqic8k945f05d8sk9mshf5d90ykd7f5p6m0n6v3jjhpwmqlq"; + }) + ]; + postPatch = '' patchShebangs . ''; From 10ddd4c7e854d4df128c707ecaacb011c6072c27 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 10 Dec 2021 11:45:12 -0500 Subject: [PATCH 014/104] synth: 0.6.1 -> 0.6.2 --- pkgs/tools/misc/synth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/synth/default.nix b/pkgs/tools/misc/synth/default.nix index 1b1efb36fe53..8bfca884f1f8 100644 --- a/pkgs/tools/misc/synth/default.nix +++ b/pkgs/tools/misc/synth/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "synth"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "getsynth"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VsvGrlFmn8Q7dhvo3Buy8G0oeNErtBT4lZ8k8WFC8Zo="; + sha256 = "sha256-MeZ5bkOMTJVvaBfGahKsXvaYhfMKcYzPFsBp/p2dPQQ="; }; - cargoSha256 = "sha256-10b2n7wMuBt90GZ6AVnSMT7r2501tounw13eJhyrmS4="; + cargoSha256 = "sha256-lNeDpUla/PfGd/AogdcOtrmL1Jp+0Ji9LH1CF7uOEe0="; nativeBuildInputs = [ pkg-config ]; From f720cf68d09b57ebe23904ba7933871be7935bb6 Mon Sep 17 00:00:00 2001 From: midchildan Date: Sat, 11 Dec 2021 03:39:27 +0900 Subject: [PATCH 015/104] socat: fix darwin build by adding missing feature check --- pkgs/tools/networking/socat/default.nix | 7 +++++++ .../socat-fix-feature-check-tcpinfo.patch | 21 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patch diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 8dac32cef5ae..b26760a72941 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-ZpCp+ZkEV7UFCXonK78sv0zDVXYXb3ZkbjUksOkcF2M="; }; + patches = [ + # This adds missing feature checks for TCP_INFO, a Linux feature + # + # Discussed in https://github.com/Homebrew/homebrew-core/pull/88595 + ./socat-fix-feature-check-tcpinfo.patch + ]; + postPatch = '' patchShebangs test.sh substituteInPlace test.sh \ diff --git a/pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patch b/pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patch new file mode 100644 index 000000000000..ec0ea88359c8 --- /dev/null +++ b/pkgs/tools/networking/socat/socat-fix-feature-check-tcpinfo.patch @@ -0,0 +1,21 @@ +diff --git a/filan.c b/filan.c +index 3465f7c..77c22a4 100644 +--- a/filan.c ++++ b/filan.c +@@ -905,6 +905,7 @@ int tcpan(int fd, FILE *outfile) { + #if WITH_TCP + + int tcpan2(int fd, FILE *outfile) { ++#ifdef TCP_INFO + struct tcp_info tcpinfo; + socklen_t tcpinfolen = sizeof(tcpinfo); + int result; +@@ -930,6 +931,8 @@ int tcpan2(int fd, FILE *outfile) { + // fprintf(outfile, "%s={%u}\t", "TCPI_", tcpinfo.tcpi_); + + return 0; ++#endif ++ return -1; + } + + #endif /* WITH_TCP */ From 2abba831e30cc5842e9bc52f4529a78407f736b4 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 10 Dec 2021 20:22:01 +0000 Subject: [PATCH 016/104] fluentd: 1.7.0 -> 1.14.3 --- pkgs/tools/misc/fluentd/Gemfile.lock | 159 ++++++++------- pkgs/tools/misc/fluentd/gemset.nix | 285 ++++++++++++++++++--------- 2 files changed, 283 insertions(+), 161 deletions(-) diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/tools/misc/fluentd/Gemfile.lock index 6b3c8dd459ec..651d9012e005 100644 --- a/pkgs/tools/misc/fluentd/Gemfile.lock +++ b/pkgs/tools/misc/fluentd/Gemfile.lock @@ -1,118 +1,139 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - aws-eventstream (1.0.3) - aws-partitions (1.207.0) - aws-sdk-cloudwatchlogs (1.25.0) - aws-sdk-core (~> 3, >= 3.61.1) + aws-eventstream (1.2.0) + aws-partitions (1.540.0) + aws-sdk-cloudwatchlogs (1.49.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.65.1) - aws-eventstream (~> 1.0, >= 1.0.2) - aws-partitions (~> 1.0) + aws-sdk-core (3.124.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-firehose (1.20.0) - aws-sdk-core (~> 3, >= 3.61.1) + aws-sdk-firehose (1.45.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.19.0) - aws-sdk-core (~> 3, >= 3.61.1) + aws-sdk-kinesis (1.38.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.24.0) - aws-sdk-core (~> 3, >= 3.61.1) + aws-sdk-kms (1.52.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.48.0) - aws-sdk-core (~> 3, >= 3.61.1) + aws-sdk-s3 (1.109.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.4) + aws-sdk-sqs (1.48.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.22.0) - aws-sdk-core (~> 3, >= 3.61.1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.0) - aws-eventstream (~> 1.0, >= 1.0.2) - bson (4.5.0) - concurrent-ruby (1.1.5) - cool.io (1.5.4) - dig_rb (1.0.1) - digest-crc (0.4.1) - elasticsearch (7.3.0) - elasticsearch-api (= 7.3.0) - elasticsearch-transport (= 7.3.0) - elasticsearch-api (7.3.0) + aws-sigv4 (1.4.0) + aws-eventstream (~> 1, >= 1.0.2) + bson (4.12.1) + concurrent-ruby (1.1.9) + cool.io (1.7.1) + digest-crc (0.6.4) + rake (>= 12.0.0, < 14.0.0) + elasticsearch (7.16.0) + elasticsearch-api (= 7.16.0) + elasticsearch-transport (= 7.16.0) + elasticsearch-api (7.16.0) multi_json - elasticsearch-transport (7.3.0) - faraday + elasticsearch-transport (7.16.0) + faraday (~> 1) multi_json - excon (0.66.0) - faraday (0.15.4) + excon (0.89.0) + faraday (1.8.0) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) multipart-post (>= 1.2, < 3) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) - fluent-plugin-cloudwatch-logs (0.7.4) + fluent-plugin-cloudwatch-logs (0.14.2) aws-sdk-cloudwatchlogs (~> 1.0) - fluentd (>= 0.14.15) - fluent-plugin-elasticsearch (3.5.5) + fluentd (>= 1.8.0) + fluent-plugin-elasticsearch (5.1.4) elasticsearch excon fluentd (>= 0.14.22) - fluent-plugin-kafka (0.11.1) + fluent-plugin-kafka (0.17.3) fluentd (>= 0.10.58, < 2) ltsv - ruby-kafka (>= 0.7.8, < 0.8.0) - fluent-plugin-kinesis (3.1.0) - aws-sdk-firehose (~> 1, != 1.9, != 1.5) - aws-sdk-kinesis (~> 1, != 1.5, != 1.4) - fluentd (>= 0.14.10, < 2) + ruby-kafka (>= 1.4.0, < 2) + fluent-plugin-kinesis (3.4.2) + aws-sdk-firehose (~> 1, != 1.9, != 1.5, != 1.15) + aws-sdk-kinesis (~> 1, != 1.5, != 1.4, != 1.14) + fluentd (>= 0.14.22, < 2) google-protobuf (~> 3) - fluent-plugin-mongo (1.3.0) + fluent-plugin-mongo (1.5.0) fluentd (>= 0.14.22, < 2) mongo (~> 2.6.0) fluent-plugin-record-reformer (0.9.1) fluentd - fluent-plugin-rewrite-tag-filter (2.2.0) + fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-s3 (1.1.11) - aws-sdk-s3 (~> 1.0) - aws-sdk-sqs (~> 1.0) + fluent-plugin-s3 (1.6.1) + aws-sdk-s3 (~> 1.60) + aws-sdk-sqs (~> 1.23) fluentd (>= 0.14.22, < 2) - fluent-plugin-webhdfs (1.2.4) + fluent-plugin-webhdfs (1.5.0) fluentd (>= 0.14.22) - webhdfs (>= 0.6.0) - fluentd (1.7.0) + webhdfs (>= 0.10.0) + fluentd (1.14.3) + bundler cool.io (>= 1.4.5, < 2.0.0) - dig_rb (~> 1.0.0) - http_parser.rb (>= 0.5.1, < 0.7.0) - msgpack (>= 0.7.0, < 2.0.0) - serverengine (>= 2.0.4, < 3.0.0) + http_parser.rb (>= 0.5.1, < 0.9.0) + msgpack (>= 1.3.1, < 2.0.0) + serverengine (>= 2.2.2, < 3.0.0) sigdump (~> 0.2.2) - strptime (>= 0.2.2, < 1.0.0) - tzinfo (~> 2.0) + strptime (>= 0.2.4, < 1.0.0) + tzinfo (>= 1.0, < 3.0) tzinfo-data (~> 1.0) + webrick (>= 1.4.2, < 1.8.0) yajl-ruby (~> 1.0) - google-protobuf (3.9.1) - http_parser.rb (0.6.0) + google-protobuf (3.19.1) + http_parser.rb (0.8.0) jmespath (1.4.0) ltsv (0.1.2) mongo (2.6.4) bson (>= 4.3.0, < 5.0.0) - msgpack (1.3.1) - multi_json (1.13.1) + msgpack (1.4.2) + multi_json (1.15.0) multipart-post (2.1.1) - public_suffix (4.0.1) - ruby-kafka (0.7.10) + public_suffix (4.0.6) + rake (13.0.6) + ruby-kafka (1.4.0) digest-crc - serverengine (2.1.1) + ruby2_keywords (0.0.5) + serverengine (2.2.4) sigdump (~> 0.2.2) sigdump (0.2.4) - strptime (0.2.3) - tzinfo (2.0.0) + strptime (0.2.5) + tzinfo (2.0.4) concurrent-ruby (~> 1.0) - tzinfo-data (1.2019.2) + tzinfo-data (1.2021.5) tzinfo (>= 1.0.0) - webhdfs (0.8.0) + webhdfs (0.10.2) addressable + webrick (1.7.0) yajl-ruby (1.4.1) PLATFORMS @@ -131,4 +152,4 @@ DEPENDENCIES fluentd BUNDLED WITH - 2.1.4 + 2.2.24 diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/tools/misc/fluentd/gemset.nix index ef063663c1a6..10e2b1678f1e 100644 --- a/pkgs/tools/misc/fluentd/gemset.nix +++ b/pkgs/tools/misc/fluentd/gemset.nix @@ -5,30 +5,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; aws-eventstream = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "100g77a5ixg4p5zwq77f28n2pdkk0y481f7v83qrlmnj22318qq6"; + sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; type = "gem"; }; - version = "1.0.3"; + version = "1.2.0"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dr16ryn9514qfdf9zrv06f7gb7gih960b82arkv868nfj4470jx"; + sha256 = "1ns0378h8qa5vwrq7a7i0xji17japs95mddpvam351k19a79vbwh"; type = "gem"; }; - version = "1.207.0"; + version = "1.540.0"; }; aws-sdk-cloudwatchlogs = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10vracvnmihazs34nlmar813qdigk34afij66182hjcciby0as6x"; + sha256 = "075qkjzjbi37hnp4qq9gkxy2cfb9v29c66qclfmxqyvfcw5s04b1"; type = "gem"; }; - version = "1.25.0"; + version = "1.49.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vb49n1ydz1m2l0qhc7gp0rvc7fa7qxczf582kyv7nsfn2k2z9s4"; + sha256 = "1chpydvgwa48rbd67k39fpg2vjp21v3kmjygbjqv1l1sqn6rjbvw"; type = "gem"; }; - version = "3.65.1"; + version = "3.124.0"; }; aws-sdk-firehose = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -58,10 +58,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s2rksdk3iv9jvcnyvnpvmh35vbs0ppan9iw4zq6fg87y44j9i74"; + sha256 = "01vf0xzyj1j85vvl16mhazkgs5zz9ym6rk5v7396mlzm8a67796g"; type = "gem"; }; - version = "1.20.0"; + version = "1.45.0"; }; aws-sdk-kinesis = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -69,10 +69,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w2azv19xi1jmp4dsqjh8af1xdyw4ajd1l5abmx3wpwd8zngxvlp"; + sha256 = "1xgjmpm2k60sl734g6lv7g8qlm4d6g9pjzgr1825fhd1h492p3dl"; type = "gem"; }; - version = "1.19.0"; + version = "1.38.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -80,10 +80,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14blvvfz67rhffi4ahby50jiip5f0hm85mcxlx6y93g0cfrnxh3m"; + sha256 = "1br4h5zwb5ir2bf6y0hnlwafkmghxi2fbjqx86agyv838ndy9npd"; type = "gem"; }; - version = "1.24.0"; + version = "1.52.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -91,10 +91,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14iv2wqvvbiz0gdms21i9n6rh8390r1yg4zcf8pzzfplbqfwqw4w"; + sha256 = "0yc96imi4v043rdxa94ncg15aapzp1i5qx076rv25zxqcbkdwzwd"; type = "gem"; }; - version = "1.48.0"; + version = "1.109.0"; }; aws-sdk-sqs = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -102,10 +102,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pszp0bcgiqn4iskb6xv5j2n540h1k9glz2w85vq5iml1casq769"; + sha256 = "0vzff2v18098cz8c6pvgfh1lc4l1kk4w5gq76rwjdxw2ahnxf4h9"; type = "gem"; }; - version = "1.22.0"; + version = "1.48.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -113,60 +113,51 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs"; + sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa"; type = "gem"; }; - version = "1.1.0"; + version = "1.4.0"; }; bson = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gxdavhccppnfbmh2cx0qxv6b6rzr5s00dsigazw808dhb34yyg7"; + sha256 = "0pnr0b7phdzhkw9xqhmqnw5673ndi13ks3dqwqmbxq6v0rsxiapc"; type = "gem"; }; - version = "4.5.0"; + version = "4.12.1"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.9"; }; "cool.io" = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l836z3qgrl5829q48qaz1zngqqxy2k0l61swqm0amhyfcgfbz1m"; + sha256 = "0dfq4h168wzvs9cvn2mm8648ynkl936pgjva2p8ik34p6d620537"; type = "gem"; }; - version = "1.5.4"; - }; - dig_rb = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12dbb1pl2vr9z7yy2zsbsjaj4hw89y56wll6kd8422mylmcw7bx4"; - type = "gem"; - }; - version = "1.0.1"; + version = "1.7.1"; }; digest-crc = { + dependencies = ["rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08q8p0fk51aa6dwhy2xmjaj76arcq9nn22gyia162jmqpccfx50l"; + sha256 = "1czaak53w8n13y1fr0q23gp0fhklvxjac5n562qj3xk6sh5ad0x2"; type = "gem"; }; - version = "0.4.1"; + version = "0.6.4"; }; elasticsearch = { dependencies = ["elasticsearch-api" "elasticsearch-transport"]; @@ -174,10 +165,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r4gpskjgg8blk7ws9g1p3d5n8bjrggyzxg2v3q40036rjp3fp1h"; + sha256 = "06vyavz2lcswj32jdcnjccax3flpcb2xnx9f5jxxm95clkpsqnwa"; type = "gem"; }; - version = "7.3.0"; + version = "7.16.0"; }; elasticsearch-api = { dependencies = ["multi_json"]; @@ -185,10 +176,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jyd03ylyvv975iail13cwlkg4h9yknhpm1kcq1dpvmbjqy7q6bz"; + sha256 = "1vp09waa4bi1xk7ixwldiix27g52fd6xcij6826xgypmzrxrn1hc"; type = "gem"; }; - version = "7.3.0"; + version = "7.16.0"; }; elasticsearch-transport = { dependencies = ["faraday" "multi_json"]; @@ -196,31 +187,111 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dqm819iqkhbny5lwkf8mh83fmffpwbscal9vmfdw4g9mf08yfnf"; + sha256 = "1kpcy250crl9w1jspqw9ykv0ixlnscym93mi9kvgljis2yql0qlx"; type = "gem"; }; - version = "7.3.0"; + version = "7.16.0"; }; excon = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05qmrx7l8abpbvp0z01fdpc731c4k6akk67l424vdp5dywhachpr"; + sha256 = "0153rr745g48h48vaplgmx7xkfjbc79acpq5jsl7agdrk4yf75ih"; type = "gem"; }; - version = "0.66.0"; + version = "0.89.0"; }; faraday = { - dependencies = ["multipart-post"]; + dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "multipart-post" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0"; + sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi"; type = "gem"; }; - version = "0.15.4"; + version = "1.8.0"; + }; + faraday-em_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-em_synchrony = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; + type = "gem"; + }; + version = "1.1.0"; + }; + faraday-httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-net_http_persistent = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; + type = "gem"; + }; + version = "1.2.0"; + }; + faraday-patron = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; + type = "gem"; + }; + version = "1.0.0"; }; fluent-config-regexp-type = { dependencies = ["fluentd"]; @@ -239,10 +310,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "046nx56zgb3l29r5v1s79zhhxsb18fwz2d8v6n6cgbv8i13xhl0l"; + sha256 = "0z1i1n921i5w43bl6rcsj526a22dzv6lrninwj8ygaksgrg5rr45"; type = "gem"; }; - version = "0.7.4"; + version = "0.14.2"; }; fluent-plugin-elasticsearch = { dependencies = ["elasticsearch" "excon" "fluentd"]; @@ -250,10 +321,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19nrhgx8mh59lpcv2jf3gb031x4zan93j9fswzjzvyjh4rlfpbmn"; + sha256 = "1gfqpl2izz036faaz3qlq61da87avhmc2406s21shayhkf8sx0p9"; type = "gem"; }; - version = "3.5.5"; + version = "5.1.4"; }; fluent-plugin-kafka = { dependencies = ["fluentd" "ltsv" "ruby-kafka"]; @@ -261,10 +332,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1km7gjcx2icwj2s2svbmrhwb1gmpk85zfa8pivm04wzc8f6vjhy2"; + sha256 = "15hdd140nqh9zg10wqdwp3m0k1l5w1xhllvbfs5z21aqwrvwc0mp"; type = "gem"; }; - version = "0.11.1"; + version = "0.17.3"; }; fluent-plugin-kinesis = { dependencies = ["aws-sdk-firehose" "aws-sdk-kinesis" "fluentd" "google-protobuf"]; @@ -272,10 +343,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j0qs09g53xsvbxpdlylwm3h2v8rvr3xpn0kwy63cjnpdf012m8f"; + sha256 = "07n5pzfz143hlvbzbx5rczb33ai9kdp48vhdak100m6xpaqkvc2p"; type = "gem"; }; - version = "3.1.0"; + version = "3.4.2"; }; fluent-plugin-mongo = { dependencies = ["fluentd" "mongo"]; @@ -283,10 +354,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "108gxrgbn0ib70n7gvdlx8xr1i0jdh1cb2n4m4m24ihyfb8i6vli"; + sha256 = "1rpaglr8hka0prvj5xsrl1af3137c7ma1d1xf1mvib5k9h0aax1f"; type = "gem"; }; - version = "1.3.0"; + version = "1.5.0"; }; fluent-plugin-record-reformer = { dependencies = ["fluentd"]; @@ -305,10 +376,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kf8p1s02pwhkks82kmkkbfbf4qlhhqiczqah4w0dnp86wp6xyw5"; + sha256 = "1vjvn8ph87cl2dl0dbaap69rciglsdma1y5ghn2vm5mvh5h7xbs6"; type = "gem"; }; - version = "2.2.0"; + version = "2.4.0"; }; fluent-plugin-s3 = { dependencies = ["aws-sdk-s3" "aws-sdk-sqs" "fluentd"]; @@ -316,10 +387,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "093fs43bixd0lmjfpkk1fl24asa1w8kacqrm82lbfx4cq4dg4fif"; + sha256 = "191j1y76irfgrsj259mj062izkfxrr5kajixdf17h26m3l9n5pgh"; type = "gem"; }; - version = "1.1.11"; + version = "1.6.1"; }; fluent-plugin-webhdfs = { dependencies = ["fluentd" "webhdfs"]; @@ -327,41 +398,41 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mhy321gxb59yk0rsawnqf3kfx33ncdlnpmn4rdfzgi0v8ya0fp4"; + sha256 = "1llpsbd5n2lgxbq16px5hbp3zfw65bdp46b08v87b6rmn3h47aiv"; type = "gem"; }; - version = "1.2.4"; + version = "1.5.0"; }; fluentd = { - dependencies = ["cool.io" "dig_rb" "http_parser.rb" "msgpack" "serverengine" "sigdump" "strptime" "tzinfo" "tzinfo-data" "yajl-ruby"]; + dependencies = ["cool.io" "http_parser.rb" "msgpack" "serverengine" "sigdump" "strptime" "tzinfo" "tzinfo-data" "webrick" "yajl-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pyjd31z95l819n9sbl6bl5bvjmyi39is0p2i0im3v0r9ydgyf27"; + sha256 = "1vrw0i286ssrr33g1zayqjk9fxmjz8a4xhrka0id2a9w3ncq275z"; type = "gem"; }; - version = "1.7.0"; + version = "1.14.3"; }; google-protobuf = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pb7v00zya00jddl7cpraz27xi3jsdjn31mm672byqwzdyghpfka"; + sha256 = "1dwx4ns39bpmzmhglyip9d68i117zspf5lp865pf6hrsmmdf2k53"; type = "gem"; }; - version = "3.9.1"; + version = "3.19.1"; }; "http_parser.rb" = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + sha256 = "1gj4fmls0mf52dlr928gaq0c0cb0m3aqa9kaa6l0ikl2zbqk42as"; type = "gem"; }; - version = "0.6.0"; + version = "0.8.0"; }; jmespath = { groups = ["default"]; @@ -399,20 +470,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1"; + sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.2"; }; multi_json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; type = "gem"; }; - version = "1.13.1"; + version = "1.15.0"; }; multipart-post = { groups = ["default"]; @@ -429,10 +500,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0"; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; type = "gem"; }; - version = "4.0.1"; + version = "4.0.6"; + }; + rake = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; }; ruby-kafka = { dependencies = ["digest-crc"]; @@ -440,10 +521,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m50s1xabvgq36k9jx2qj8bd8ivvkxa6fs2czi22jxhzqsl3xlvc"; + sha256 = "1bmp3nsf836z3392drhlfmhav2025k46yj8sbhphpphr22v3ka7k"; type = "gem"; }; - version = "0.7.10"; + version = "1.4.0"; + }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; }; serverengine = { dependencies = ["sigdump"]; @@ -451,10 +542,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10y535621y0kyn40bkcnl01zrsf3z4abf4mdl8m3fdcmj30mazlw"; + sha256 = "1gzhggx40a53mnv4f32xag4h6ai0s5m3w06s59b0h6ih7rqvwns9"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.4"; }; sigdump = { groups = ["default"]; @@ -471,10 +562,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yj5wwa7wbhgi7w8d9ihpzpf99niw956fhyxddhayj09fgmdcxd8"; + sha256 = "1ycs0xz58kymf7yp4h56f0nid2z7g3s18dj7pa3p790pfzzpgvcq"; type = "gem"; }; - version = "0.2.3"; + version = "0.2.5"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -482,10 +573,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jp9f5120az6q84w5w19nnn6g6yl2whc1cbcnnv4xryw9q8vqbkb"; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; type = "gem"; }; - version = "2.0.0"; + version = "2.0.4"; }; tzinfo-data = { dependencies = ["tzinfo"]; @@ -493,10 +584,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m507in0d7vlfgasxpkz3y1a44zp532k9qlqcaz90ay939sz9h5q"; + sha256 = "0w1iyvw0m2xvdr4654jnn1g27jwj84y94dvaj1k2p3lcrvndm698"; type = "gem"; }; - version = "1.2019.2"; + version = "1.2021.5"; }; webhdfs = { dependencies = ["addressable"]; @@ -504,10 +595,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gs6xb9dz9bp5xc38yplfy48jcgj7jrj0zg0vgi7ydkxnkzkhbf2"; + sha256 = "0pkdsj8ybjfp1sr7gzdxd7van5fpmhc9v2c5g3hifdx4s4yzhcq7"; type = "gem"; }; - version = "0.8.0"; + version = "0.10.2"; + }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + type = "gem"; + }; + version = "1.7.0"; }; yajl-ruby = { groups = ["default"]; From 2d939d32621225eccaa249bf37ffe0abc445df5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Dec 2021 01:08:58 +0000 Subject: [PATCH 017/104] gmsh: 4.8.4 -> 4.9.0 --- pkgs/applications/science/math/gmsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 84f7ca72a3c8..0a48d813e915 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.8.4"; + version = "4.9.0"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "sha256-dg29wHLqo8gtBmxbo7BurN0zBOsqlzc/5K2pUJ8Las4="; + sha256 = "sha256-uO8TPJtm/+Et8XR+ctSs8Z8esenNlesPV3y8QIHZvqM="; }; buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL From 2d55add786c2b5efaec2c65a8e072afbfdc22475 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 11 Dec 2021 04:20:00 +0000 Subject: [PATCH 018/104] gdown: 4.0.2 -> 4.2.0 --- pkgs/development/python-modules/gdown/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 851f76128761..65bca090f9b6 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -6,18 +6,19 @@ , tqdm , setuptools , six +, beautifulsoup4 }: buildPythonApplication rec { pname = "gdown"; - version = "4.0.2"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XSYc3mCsFW+x6aZFDNtUE9lHv9vPUvkdsqmbtFX7aQw="; + sha256 = "bd871c125242a9d3691aa74f360b6b5268a58c13991bb2405fdb3ec3028307dc"; }; - propagatedBuildInputs = [ filelock requests tqdm setuptools six ]; + propagatedBuildInputs = [ filelock requests tqdm setuptools six beautifulsoup4 ]; checkPhase = '' $out/bin/gdown --help > /dev/null From 6684029b0cf28e243f478039e200b994d7da221c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 11 Dec 2021 04:20:00 +0000 Subject: [PATCH 019/104] lxd: 4.20 -> 4.21 https://github.com/lxc/lxd/releases/tag/lxd-4.21 --- pkgs/tools/admin/lxd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 24e241f1b247..8a3ece8e0f90 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -11,13 +11,13 @@ buildGoPackage rec { pname = "lxd"; - version = "4.20"; + version = "4.21"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz"; - sha256 = "1mcf4i4z9y4l895v50amx8nix6wnaxv9h44012vj8w6wwbr4wl1m"; + sha256 = "1b2jls3jgvgdl0136nar8zm3hfrp0gqxxq9fh7vxc52r1aslarvs"; }; postPatch = '' From 6171d96f4feb2866b607226e241b0f13a6e274f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Dec 2021 06:27:33 +0000 Subject: [PATCH 020/104] flint: 2.8.0 -> 2.8.4 --- pkgs/development/libraries/flint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 548f561f25a0..858144b150aa 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -13,11 +13,11 @@ assert withBlas -> openblas != null && blas.implementation == "openblas" && lapa stdenv.mkDerivation rec { pname = "flint"; - version = "2.8.0"; + version = "2.8.4"; src = fetchurl { url = "https://www.flintlib.org/flint-${version}.tar.gz"; - sha256 = "sha256-WEI1zcOdd52ZIOrvFv4ITzwm/+7qADo//2SiCg8zRJ4="; + sha256 = "sha256-Yd+S6oyOncaS1Gxx1/UKqgmjPUugjQKheEcwpEXl5L4="; }; buildInputs = [ From f9610acae1d04179f178fe57d6f2cc758d75101f Mon Sep 17 00:00:00 2001 From: urlordjames <32751441+urlordjames@users.noreply.github.com> Date: Sat, 11 Dec 2021 11:50:10 -0500 Subject: [PATCH 021/104] drogon: 1.7.3 -> 1.7.4 --- pkgs/development/libraries/drogon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 90bd4035ed6a..7258cb767e3f 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "drogon"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${version}"; - sha256 = "0j7bnc6l5hbcf0l7pjzw82i9z1rbh57ni60wpa50q10gwbm4waxn"; + sha256 = "02igryrv8782rwqb4w49frymlw9n7hv8fskqsw43rqly650vzakb"; fetchSubmodules = true; }; From 2deb8c0fc588aa0ceaff8110f08363dc9415d64c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 6 Dec 2021 14:35:27 +0100 Subject: [PATCH 022/104] nixos/postgresql: improve docs on how to upgrade * It's IMHO a slight overkill to deploy an additional container even if it's never supposed to be running. Also, the currently suggested approach wouldn't use the default state-directory for the new version. * Explain the structure of the state-directories and where the version-numbers are actually coming from. * Mention `./analyze_new_cluster.sh` & `./delete_old_cluster.sh`. --- .../modules/services/databases/postgresql.xml | 80 ++++++++++++------- 1 file changed, 51 insertions(+), 29 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml index 07af4c937f03..0ca9f3faed21 100644 --- a/nixos/modules/services/databases/postgresql.xml +++ b/nixos/modules/services/databases/postgresql.xml @@ -52,37 +52,51 @@ Type "help" for help.
Upgrading + + + The steps below demonstrate how to upgrade from an older version to pkgs.postgresql_13. + These instructions are also applicable to other versions. + + - Major PostgreSQL upgrade requires PostgreSQL downtime and a few imperative steps to be called. To simplify this process, use the following NixOS module: + Major PostgreSQL upgrades require a downtime and a few imperative steps to be called. This is the case because + each major version has some internal changes in the databases' state during major releases. Because of that, + NixOS places the state into /var/lib/postgresql/<version> where each version + can be obtained like this: - containers.temp-pg.config.services.postgresql = { - enable = true; - package = pkgs.postgresql_12; - ## set a custom new dataDir - # dataDir = "/some/data/dir"; - }; - environment.systemPackages = - let newpg = config.containers.temp-pg.config.services.postgresql; - in [ - (pkgs.writeScriptBin "upgrade-pg-cluster" '' - set -x - export OLDDATA="${config.services.postgresql.dataDir}" - export NEWDATA="${newpg.dataDir}" - export OLDBIN="${config.services.postgresql.package}/bin" - export NEWBIN="${newpg.package}/bin" +$ nix-instantiate --eval -A postgresql_13.psqlSchema +"13" + + For an upgrade, a script like this can be used to simplify the process: + +{ config, pkgs, ... }: +{ + = [ + (pkgs.writeScriptBin "upgrade-pg-cluster" '' + set -eux + # XXX it's perhaps advisable to stop all services that depend on postgresql + systemctl stop postgresql - install -d -m 0700 -o postgres -g postgres "$NEWDATA" - cd "$NEWDATA" - sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" + # XXX replace `<new version>` with the psqlSchema here + export NEWDATA="/var/lib/postgresql/<new version>" - systemctl stop postgresql # old one + # XXX specify the postgresql package you'd like to upgrade to + export NEWBIN="${pkgs.postgresql_13}/bin" - sudo -u postgres $NEWBIN/pg_upgrade \ - --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \ - --old-bindir $OLDBIN --new-bindir $NEWBIN \ - "$@" - '') - ]; + export OLDDATA="${config.}" + export OLDBIN="${config.}/bin" + + install -d -m 0700 -o postgres -g postgres "$NEWDATA" + cd "$NEWDATA" + sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" + + sudo -u postgres $NEWBIN/pg_upgrade \ + --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \ + --old-bindir $OLDBIN --new-bindir $NEWBIN \ + "$@" + '') + ]; +} @@ -103,17 +117,25 @@ Type "help" for help. - Run upgrade-pg-cluster. It will stop old postgresql, initialize new one and migrate old one to new one. You may supply arguments like --jobs 4 and --link to speedup migration process. See for details. + Run upgrade-pg-cluster. It will stop old postgresql, initialize a new one and migrate the old one to the new one. You may supply arguments like --jobs 4 and --link to speedup migration process. See for details. - Change postgresql package in NixOS configuration to the one you were upgrading to, and change dataDir to the one you have migrated to. Rebuild NixOS. This should start new postgres using upgraded data directory. + Change postgresql package in NixOS configuration to the one you were upgrading to via . Rebuild NixOS. This should start new postgres using upgraded data directory and all services you stopped during the upgrade. - After upgrade you may want to ANALYZE new db. + After the upgrade it's advisable to analyze the new cluster (as su -l postgres in the + , in this example /var/lib/postgresql/13): + +$ ./analyze_new_cluster.sh + + The next step removes the old state-directory! + +$ ./delete_old_cluster.sh + From 94809fac3082749c19194139f3b5aae9b96687a9 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Sat, 11 Dec 2021 18:38:32 +0000 Subject: [PATCH 023/104] whitebox-tools: 1.4.0 -> 2.0.0 --- .../gis/whitebox-tools/default.nix | 12 +- .../whitebox-tools/update-cargo-lock.patch | 578 ++++++++++++++++++ 2 files changed, 586 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/gis/whitebox-tools/update-cargo-lock.patch diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index fdfbcdbfccf6..c60523e3e996 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -1,18 +1,22 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "whitebox_tools"; - version = "1.4.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "jblindsay"; repo = "whitebox-tools"; - rev = version; - sha256 = "0s5byn8qyi1bm59j9vhwqaygw5cxipc7wbd3flh7n24nx0s8pr8c"; + rev = "7551aa70e8d9cbd8b3744fde48e82aa40393ebf8"; + sha256 = "0mngw99aj60bf02y3piimxc1z1zbw1dhwyixndxh3b3m9xqhk51h"; }; + cargoPatches = [./update-cargo-lock.patch]; + buildInputs = lib.optional stdenv.isDarwin Security; - cargoSha256 = "0rdg9k44si37iyqlcl1rw7ilajcvqy93gbfpd7n4cr1hg9ypm0m3"; + cargoSha256 = "08xif13vqhy71w7fnxdyxsd9hvkr22c6kffh521sr0l8z6zlp0gq"; + + doCheck = false; meta = with lib; { description = "An advanced geospatial data analysis platform"; diff --git a/pkgs/applications/gis/whitebox-tools/update-cargo-lock.patch b/pkgs/applications/gis/whitebox-tools/update-cargo-lock.patch new file mode 100644 index 000000000000..8c9f1eeff11b --- /dev/null +++ b/pkgs/applications/gis/whitebox-tools/update-cargo-lock.patch @@ -0,0 +1,578 @@ +diff --git a/Cargo.lock b/Cargo.lock +index a0bcf0b7..c6c65322 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -4,9 +4,9 @@ version = 3 + + [[package]] + name = "adler" +-version = "0.2.3" ++version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" ++checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + + [[package]] + name = "adler32" +@@ -27,9 +27,9 @@ dependencies = [ + + [[package]] + name = "alloc-no-stdlib" +-version = "2.0.1" ++version = "2.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5192ec435945d87bc2f70992b4d818154b5feede43c09fb7592146374eac90a6" ++checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3" + + [[package]] + name = "alloc-stdlib" +@@ -63,15 +63,15 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + + [[package]] + name = "bitflags" +-version = "1.2.1" ++version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] + name = "brotli" +-version = "3.3.0" ++version = "3.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7f29919120f08613aadcd4383764e00526fc9f18b6c0895814faeed0dd78613e" ++checksum = "71cb90ade945043d3d53597b2fc359bb063db8ade2bcffe7997351d0756e9d50" + dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +@@ -80,9 +80,9 @@ dependencies = [ + + [[package]] + name = "brotli-decompressor" +-version = "2.3.1" ++version = "2.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1052e1c3b8d4d80eb84a8b94f0a1498797b5fb96314c001156a1c761940ef4ec" ++checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" + dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +@@ -90,9 +90,9 @@ dependencies = [ + + [[package]] + name = "byteorder" +-version = "1.4.2" ++version = "1.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" ++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + + [[package]] + name = "bzip2" +@@ -106,9 +106,9 @@ dependencies = [ + + [[package]] + name = "bzip2-sys" +-version = "0.1.10+1.0.8" ++version = "0.1.11+1.0.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "17fa3d1ac1ca21c5c4e36a97f3c3eb25084576f6fc47bf0139c1123434216c6c" ++checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" + dependencies = [ + "cc", + "libc", +@@ -117,9 +117,9 @@ dependencies = [ + + [[package]] + name = "cc" +-version = "1.0.66" ++version = "1.0.72" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" ++checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" + + [[package]] + name = "cfg-if" +@@ -149,26 +149,20 @@ dependencies = [ + "bitflags", + ] + +-[[package]] +-name = "const_fn" +-version = "0.4.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6" +- + [[package]] + name = "crc32fast" +-version = "1.2.1" ++version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" ++checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836" + dependencies = [ + "cfg-if", + ] + + [[package]] + name = "crossbeam-channel" +-version = "0.5.0" ++version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" ++checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" + dependencies = [ + "cfg-if", + "crossbeam-utils", +@@ -176,9 +170,9 @@ dependencies = [ + + [[package]] + name = "crossbeam-deque" +-version = "0.8.0" ++version = "0.8.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" ++checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" + dependencies = [ + "cfg-if", + "crossbeam-epoch", +@@ -187,12 +181,11 @@ dependencies = [ + + [[package]] + name = "crossbeam-epoch" +-version = "0.9.1" ++version = "0.9.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d" ++checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" + dependencies = [ + "cfg-if", +- "const_fn", + "crossbeam-utils", + "lazy_static", + "memoffset", +@@ -201,11 +194,10 @@ dependencies = [ + + [[package]] + name = "crossbeam-utils" +-version = "0.8.1" ++version = "0.8.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" ++checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" + dependencies = [ +- "autocfg 1.0.1", + "cfg-if", + "lazy_static", + ] +@@ -216,16 +208,22 @@ version = "1.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + ++[[package]] ++name = "fasteval" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4f4cdac9e4065d7c48e30770f8665b8cef9a3a73a63a4056a33a5f395bc7cf75" ++ + [[package]] + name = "flate2" +-version = "1.0.20" ++version = "1.0.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" ++checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" + dependencies = [ + "cfg-if", + "crc32fast", + "libc", +- "miniz_oxide 0.4.3", ++ "miniz_oxide 0.4.4", + ] + + [[package]] +@@ -236,9 +234,9 @@ checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + + [[package]] + name = "generic-array" +-version = "0.12.3" ++version = "0.12.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" ++checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" + dependencies = [ + "typenum", + ] +@@ -256,18 +254,18 @@ dependencies = [ + + [[package]] + name = "hermit-abi" +-version = "0.1.18" ++version = "0.1.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" + dependencies = [ + "libc", + ] + + [[package]] + name = "itoa" +-version = "0.4.7" ++version = "0.4.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" ++checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + + [[package]] + name = "kdtree" +@@ -280,9 +278,9 @@ dependencies = [ + + [[package]] + name = "las" +-version = "0.7.4" ++version = "0.7.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1c0c61a3595a942582db0ae4ac8367bba6cad29afc6387db9d7315c05890d14c" ++checksum = "80dd11fe6e333400f08bd3a17c20146bfe4f719bb92545b388be9d21e69644b1" + dependencies = [ + "byteorder", + "chrono", +@@ -295,9 +293,9 @@ dependencies = [ + + [[package]] + name = "laz" +-version = "0.5.2" ++version = "0.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "01192c65789af53929798b55be28a65379028e2f822939e2fe887e8a694f5562" ++checksum = "4d7a69934a6239f0b4ebb431afe9554df2ec63ef8325a9696b0e94735f554960" + dependencies = [ + "byteorder", + "num-traits", +@@ -311,9 +309,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + + [[package]] + name = "libc" +-version = "0.2.86" ++version = "0.2.110" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" ++checksum = "b58a4469763e4e3a906c4ed786e1c70512d16aa88f84dded826da42640fc6a1c" + + [[package]] + name = "libm" +@@ -347,9 +345,9 @@ dependencies = [ + + [[package]] + name = "memoffset" +-version = "0.6.1" ++version = "0.6.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" ++checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" + dependencies = [ + "autocfg 1.0.1", + ] +@@ -365,9 +363,9 @@ dependencies = [ + + [[package]] + name = "miniz_oxide" +-version = "0.4.3" ++version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" ++checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" + dependencies = [ + "adler", + "autocfg 1.0.1", +@@ -402,23 +400,23 @@ dependencies = [ + + [[package]] + name = "num" +-version = "0.3.1" ++version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f" ++checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" + dependencies = [ + "num-bigint", +- "num-complex 0.3.1", ++ "num-complex 0.4.0", + "num-integer", + "num-iter", +- "num-rational 0.3.2", ++ "num-rational 0.4.0", + "num-traits", + ] + + [[package]] + name = "num-bigint" +-version = "0.3.2" ++version = "0.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba" ++checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" + dependencies = [ + "autocfg 1.0.1", + "num-integer", +@@ -437,9 +435,9 @@ dependencies = [ + + [[package]] + name = "num-complex" +-version = "0.3.1" ++version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" ++checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085" + dependencies = [ + "num-traits", + ] +@@ -478,9 +476,9 @@ dependencies = [ + + [[package]] + name = "num-rational" +-version = "0.3.2" ++version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" ++checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" + dependencies = [ + "autocfg 1.0.1", + "num-bigint", +@@ -510,9 +508,9 @@ dependencies = [ + + [[package]] + name = "pdqselect" +-version = "0.1.0" ++version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4ec91767ecc0a0bbe558ce8c9da33c068066c57ecc8bb8477ef8c1ad3ef77c27" ++checksum = "7778906d9321dd56cde1d1ffa69a73e59dcf5fda6d366f62727adf2bd4193aee" + + [[package]] + name = "pest" +@@ -525,9 +523,9 @@ dependencies = [ + + [[package]] + name = "pkg-config" +-version = "0.3.19" ++version = "0.3.23" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" ++checksum = "d1a3ea4f0dd7f1f3e512cf97bf100819aa547f36a6eccac8dbaae839eb92363e" + + [[package]] + name = "podio" +@@ -537,24 +535,24 @@ checksum = "b18befed8bc2b61abc79a457295e7e838417326da1586050b919414073977f19" + + [[package]] + name = "ppv-lite86" +-version = "0.2.10" ++version = "0.2.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" ++checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" + + [[package]] + name = "proc-macro2" +-version = "1.0.24" ++version = "1.0.33" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" ++checksum = "fb37d2df5df740e582f28f8560cf425f52bb267d872fe58358eadb554909f07a" + dependencies = [ + "unicode-xid", + ] + + [[package]] + name = "quote" +-version = "1.0.8" ++version = "1.0.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" ++checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" + dependencies = [ + "proc-macro2", + ] +@@ -756,9 +754,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" + + [[package]] + name = "rayon" +-version = "1.5.0" ++version = "1.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" ++checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" + dependencies = [ + "autocfg 1.0.1", + "crossbeam-deque", +@@ -768,9 +766,9 @@ dependencies = [ + + [[package]] + name = "rayon-core" +-version = "1.9.0" ++version = "1.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" ++checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" + dependencies = [ + "crossbeam-channel", + "crossbeam-deque", +@@ -809,9 +807,9 @@ dependencies = [ + + [[package]] + name = "ryu" +-version = "1.0.5" ++version = "1.0.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568" + + [[package]] + name = "scopeguard" +@@ -839,18 +837,18 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.123" ++version = "1.0.131" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" ++checksum = "b4ad69dfbd3e45369132cc64e6748c2d65cdfb001a2b1c232d128b4ad60561c1" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.123" ++version = "1.0.131" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" ++checksum = "b710a83c4e0dff6a3d511946b95274ad9ca9e5d3ae497b63fda866ac955358d2" + dependencies = [ + "proc-macro2", + "quote", +@@ -859,9 +857,9 @@ dependencies = [ + + [[package]] + name = "serde_json" +-version = "1.0.64" ++version = "1.0.72" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" ++checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527" + dependencies = [ + "itoa", + "ryu", +@@ -879,9 +877,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "1.0.60" ++version = "1.0.82" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" ++checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59" + dependencies = [ + "proc-macro2", + "quote", +@@ -890,18 +888,18 @@ dependencies = [ + + [[package]] + name = "thiserror" +-version = "1.0.26" ++version = "1.0.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" ++checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" + dependencies = [ + "thiserror-impl", + ] + + [[package]] + name = "thiserror-impl" +-version = "1.0.26" ++version = "1.0.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" ++checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" + dependencies = [ + "proc-macro2", + "quote", +@@ -921,9 +919,9 @@ dependencies = [ + + [[package]] + name = "typenum" +-version = "1.12.0" ++version = "1.14.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" ++checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" + + [[package]] + name = "ucd-trie" +@@ -933,9 +931,9 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" + + [[package]] + name = "unicode-xid" +-version = "0.2.1" ++version = "0.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + + [[package]] + name = "uuid" +@@ -957,10 +955,11 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + + [[package]] + name = "whitebox_common" +-version = "1.5.0" ++version = "2.0.0" + dependencies = [ + "byteorder", + "nalgebra", ++ "num-traits", + "rand 0.7.3", + "rstar", + "rustc_version", +@@ -970,7 +969,7 @@ dependencies = [ + + [[package]] + name = "whitebox_lidar" +-version = "1.5.0" ++version = "2.0.0" + dependencies = [ + "brotli", + "byteorder", +@@ -986,7 +985,9 @@ dependencies = [ + name = "whitebox_plugins" + version = "1.5.0" + dependencies = [ ++ "fasteval", + "num_cpus", ++ "rand 0.7.3", + "whitebox_common", + "whitebox_raster", + "whitebox_vector", +@@ -994,7 +995,7 @@ dependencies = [ + + [[package]] + name = "whitebox_raster" +-version = "1.5.0" ++version = "2.0.0" + dependencies = [ + "byteorder", + "chrono", +@@ -1006,7 +1007,7 @@ dependencies = [ + + [[package]] + name = "whitebox_tools" +-version = "1.5.0" ++version = "2.0.0" + dependencies = [ + "byteorder", + "chrono", From be4883e2181a7f9e1513be091ea573f9f2411c81 Mon Sep 17 00:00:00 2001 From: Joerie de Gram Date: Sat, 11 Dec 2021 20:02:15 +0100 Subject: [PATCH 024/104] zap: 2.11.0 -> 2.11.1 Fixes CVE-2021-44228 #150288 --- pkgs/tools/networking/zap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 69c5f165b276..8fdf8a38f317 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "zap"; - version = "2.11.0"; + version = "2.11.1"; src = fetchurl { url = "https://github.com/zaproxy/zaproxy/releases/download/v${version}/ZAP_${version}_Linux.tar.gz"; - sha256 = "sha256-wr64T3+ps5r2V72z4NDbqWQlJX6kjg6LIu7szY1VaB4="; + sha256 = "0b1qqrjm4m76djy0az9hnz3rqpz1qkql4faqmi7gkx33b1p6d0sz"; }; buildInputs = [ jre ]; From 9cd228f3e3d5d5db25ec65cf53b71339d594a34a Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 11 Dec 2021 19:13:27 +0000 Subject: [PATCH 025/104] libreoffice-still: 7.1.7.2 -> 7.1.8.1 --- .../office/libreoffice/src-still/download.nix | 8 ++++---- .../office/libreoffice/src-still/primary.nix | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/office/libreoffice/src-still/download.nix b/pkgs/applications/office/libreoffice/src-still/download.nix index 990eeb329a3c..57eebe6ec6dd 100644 --- a/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/pkgs/applications/office/libreoffice/src-still/download.nix @@ -644,11 +644,11 @@ md5name = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678-neon-0.31.2.tar.gz"; } { - name = "nss-3.55-with-nspr-4.27.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.55-with-nspr-4.27.tar.gz"; - sha256 = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45"; + name = "nss-3.73-with-nspr-4.32.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.73-with-nspr-4.32.tar.gz"; + sha256 = "07a9e5b70f121a62706140d4cacc3006d3efb869da40f3a2bf7a65d37847f4d9"; md5 = ""; - md5name = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45-nss-3.55-with-nspr-4.27.tar.gz"; + md5name = "07a9e5b70f121a62706140d4cacc3006d3efb869da40f3a2bf7a65d37847f4d9-nss-3.73-with-nspr-4.32.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; diff --git a/pkgs/applications/office/libreoffice/src-still/primary.nix b/pkgs/applications/office/libreoffice/src-still/primary.nix index 9ce1d26c1478..83179f2a136a 100644 --- a/pkgs/applications/office/libreoffice/src-still/primary.nix +++ b/pkgs/applications/office/libreoffice/src-still/primary.nix @@ -8,8 +8,8 @@ rec { major = "7"; minor = "1"; - patch = "7"; - tweak = "2"; + patch = "8"; + tweak = "1"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "T98ICdiAM4i9E6zis0V/Cmq5+e98mNb0bMZA//xelLo="; + sha256 = "sha256-TGcR2/TSQJOjq7G1vXSa4MaEA6fG95rHVZfnjoiqeJM="; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "g8skm02R5nRyF09ZbL9kJqMxRqaQ0AfpletDK3AAggk="; + sha256 = "sha256-jy5dUzKCEBYiTXh6dBwgdfW1Ok5l1iDGyL13icQHWEM="; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "jAFrO4RyONhPH3H5QW0SL8Id53bBvJ7AYxSNtLhG4rQ="; + sha256 = "sha256-tr2hmCeRRyft03Nfk8afSaurCV6DJSYuxKo4GPK/It4="; }; } From 9c36e9cb9a7aceaed14c1ccd4d2d009a267665a7 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 11 Dec 2021 19:14:35 +0000 Subject: [PATCH 026/104] libreoffice-fresh: 7.2.3.2 -> 7.2.4.1 --- .../office/libreoffice/src-fresh/download.nix | 8 ++++---- .../office/libreoffice/src-fresh/primary.nix | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index 9fdff0766b6e..ecce7cf18145 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -637,11 +637,11 @@ md5name = "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678-neon-0.31.2.tar.gz"; } { - name = "nss-3.55-with-nspr-4.27.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.55-with-nspr-4.27.tar.gz"; - sha256 = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45"; + name = "nss-3.73-with-nspr-4.32.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.73-with-nspr-4.32.tar.gz"; + sha256 = "07a9e5b70f121a62706140d4cacc3006d3efb869da40f3a2bf7a65d37847f4d9"; md5 = ""; - md5name = "ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45-nss-3.55-with-nspr-4.27.tar.gz"; + md5name = "07a9e5b70f121a62706140d4cacc3006d3efb869da40f3a2bf7a65d37847f4d9-nss-3.73-with-nspr-4.32.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index 684383980bc4..f1a1478a3cf9 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,8 +8,8 @@ rec { major = "7"; minor = "2"; - patch = "3"; - tweak = "2"; + patch = "4"; + tweak = "1"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "sha256-VslzdJVtmMjvzW1YdxwJUMimQe2E/WTbZjgohMTDtFE="; + sha256 = "sha256-Ymi5BmpgWGzwpfXtmWDN+Gpf9Yb+Zpm/TSltWA3gjyE="; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "sha256-B/UVlPyzL7M3PpQwS63huRtti1VR+OaI2nd+T1IESOw="; + sha256 = "sha256-8nzCt7/J7gqJPtHOrVu7UTonJw1pxu4fnLWJyWOUHa8="; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "sha256-CH4URClK/lq0nqN6LHjAVcKjkADol5AX3WuyAl0srnk="; + sha256 = "sha256-rZb1ej3GbgXOHOZWVKKJVuir2urLmvGmrdpB1vpcaCk="; }; } From b2aa4f1f251a8747485cfd0168c5ca3ee47a0fee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Dec 2021 20:17:44 +0100 Subject: [PATCH 027/104] esphome: 2021.11.4 -> 2021.12.0 --- pkgs/tools/misc/esphome/dashboard.nix | 4 ++-- pkgs/tools/misc/esphome/default.nix | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index 5a44d7e84606..43f71c2d69ee 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20211201.0"; + version = "20211211.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/VARM59TI2Ff70Jq0smFMrt4o2G/wKSdcOreLfxMAMQ="; + sha256 = "sha256-xF1/gUJCr4qRO+AnWeFO6b1YnQBOgve/23ZaGmCa910="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 6f5725b2b313..26fe3c459ccb 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -17,23 +17,19 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2021.11.4"; + version = "2021.12.0"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-hPnng3Jkb2FucEOar/MIjvWHKbT3NNxEn6CIr3sd1Ng="; + sha256 = "sha256-OiqY72XuzkdVxrUyPwAgH/Lnrht4lTlLYOirjF9UpjM="; }; patches = [ # fix missing write permissions on src files before modifing them ./fix-src-permissions.patch - (fetchpatch { - url = "https://github.com/esphome/esphome/commit/fbe1bca1b9896ba8c8b754c5a4faf790bffd887b.patch"; - sha256 = "sha256-Iyc79iL2YkLGD81TbFK3GaCY2L9nTE9mKz6MQSNQWr8="; - }) ]; postPatch = '' From cbe394366af7866e02c97dda951f47df6a65c906 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Dec 2021 20:47:18 +0000 Subject: [PATCH 028/104] callaudiod: 0.1.0 -> 0.1.1 --- pkgs/applications/audio/callaudiod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix index e7cd257f257e..bba86afcfc26 100644 --- a/pkgs/applications/audio/callaudiod/default.nix +++ b/pkgs/applications/audio/callaudiod/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "callaudiod"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "mobian1"; repo = pname; rev = version; - sha256 = "087589z45xvldn2m1g79y0xbwzylwkjmfk83s5xjixyq0wqmfppd"; + sha256 = "sha256-VASBYx/SZo2GJ8znthFIdjtZKbYVssWO1xhYcZMz9hI="; }; strictDeps = true; From 822e58e607878ac15ee4919d19016701e06804a7 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sat, 11 Dec 2021 15:00:35 -0600 Subject: [PATCH 029/104] dupeguru: set platforms to unix --- pkgs/applications/misc/dupeguru/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index d2332b4d9c7d..7612153fe563 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -65,7 +65,7 @@ python3Packages.buildPythonApplication rec { description = "GUI tool to find duplicate files in a system"; homepage = "https://github.com/arsenetar/dupeguru"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.novoxudonoser ]; }; } From 77f65a82fe8b5cbe5e220f06bc4a0f24e69021fe Mon Sep 17 00:00:00 2001 From: Mifom Date: Sun, 12 Dec 2021 00:04:57 +0300 Subject: [PATCH 030/104] gitui: 0.18.0 -> 0.19.0 --- .../version-management/git-and-tools/gitui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index b46cfb8ee8df..24ba62a6908c 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip, pkg-config }: rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NzE2eT3QxnbDW63Cnv6M7IlYgb2XuymphwaL1PTfcyQ="; + sha256 = "sha256-PNyXmXHS8StJhx6Qko7zbXrX1CX3owC1HmyX9VV7tEg="; }; - cargoSha256 = "sha256-9SWovdjYfeneqOVl+I+tuJTIC/htC7h1tXi2KUbdYb8="; + cargoSha256 = "sha256-Q6QUxIe5bkoEcxZZwhJbihaHhSsX8SLqWzmjp8hFsS4="; nativeBuildInputs = [ python3 perl pkg-config ]; buildInputs = [ openssl ] From e6217908a39e5d61366141913798d9fa59974bf6 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sat, 11 Dec 2021 22:43:02 +0100 Subject: [PATCH 031/104] nixos/glusterfs: remove syslog.target from services --- nixos/modules/services/network-filesystems/glusterfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index bc8be05ca8cb..38be098de5d9 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -187,7 +187,7 @@ in wantedBy = [ "multi-user.target" ]; - after = [ "syslog.target" "network.target" ]; + after = [ "network.target" ]; preStart = '' install -m 0755 -d /var/log/glusterfs From 50a74117b6acc19e09b1ddafd32ed0f196be5fed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Dec 2021 21:51:10 +0000 Subject: [PATCH 032/104] cargo-cache: 0.6.3 -> 0.7.0 --- pkgs/development/tools/rust/cargo-cache/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix index 12d9bd6bb036..62c9f9b97e55 100644 --- a/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/pkgs/development/tools/rust/cargo-cache/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cache"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "matthiaskrgr"; repo = pname; rev = version; - sha256 = "sha256-y6rvdY9511XScxLWPrH9aUFgSmRYmGqKE56MPBTH9OM="; + sha256 = "sha256-MPU+hmYfmWftVEkdT/sZx9ESgCPTb7m4lEnYf5bOSYU="; }; - cargoSha256 = "sha256-H6MBAXrKu4hZwx3lGHN6YMuYzeb21Zq0tVlF/lsQmLI="; + cargoSha256 = "sha256-6Ffgg5/B1IFnTlSjzhAsnhxz8jBcgk01RIkwgLqlsvc="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; From 90185d9f22a8ebb2de75d366016d08c4c8387a0c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Dec 2021 23:01:07 +0100 Subject: [PATCH 033/104] wad: migrate to new Python app style --- pkgs/tools/security/wad/default.nix | 29 +++++++++++++++-------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/security/wad/default.nix b/pkgs/tools/security/wad/default.nix index ee731798097d..9b284a42a018 100644 --- a/pkgs/tools/security/wad/default.nix +++ b/pkgs/tools/security/wad/default.nix @@ -1,31 +1,32 @@ { lib -, buildPythonApplication -, fetchPypi -, mock -, pytestCheckHook -, six +, fetchFromGitHub +, python3 }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "wad"; version = "0.4.6"; + format = "setuptools"; - src = fetchPypi { - inherit pname; - inherit version; - sha256 = "02jq77h6g9v7n4qqq7qri6wmhggy257983dwgmpjsf4qsagkgwy8"; + src = fetchFromGitHub { + owner = "CERN-CERT"; + repo = "WAD"; + rev = "v${version}"; + hash = "sha256-/mlmOzFkyKpmK/uk4813Wk0cf/+ynX3Qxafnd1mGR5k="; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ six ]; - checkInputs = [ - pytestCheckHook + checkInputs = with python3.pkgs; [ mock + pytestCheckHook ]; - pythonImportsCheck = [ "wad" ]; + pythonImportsCheck = [ + "wad" + ]; meta = with lib; { description = "Tool for detecting technologies used by web applications"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a698cf8fb640..ba8834c54527 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29147,7 +29147,7 @@ with pkgs; vym = qt5.callPackage ../applications/misc/vym { }; - wad = python3Packages.callPackage ../tools/security/wad { }; + wad = callPackage ../tools/security/wad { }; wafw00f = python3Packages.callPackage ../tools/security/wafw00f { }; From 0fe8586f433bf411cbcd2a4997ac23b05d8b9776 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sat, 11 Dec 2021 23:13:36 +0100 Subject: [PATCH 034/104] glusterfs: 9.4 -> 10.0 --- pkgs/tools/filesystems/glusterfs/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 90148cbf2a45..b0524e9bc68a 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -1,8 +1,8 @@ -{lib, stdenv, fetchFromGitHub, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline, +{lib, stdenv, fetchFromGitHub, fuse, bison, flex, openssl, python3, ncurses, readline, autoconf, automake, libtool, pkg-config, zlib, libaio, libxml2, acl, sqlite, liburcu, liburing, attr, makeWrapper, coreutils, gnused, gnugrep, which, openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, - rsync, glibc, rpcsvc-proto, libtirpc + rsync, glibc, rpcsvc-proto, libtirpc, gperftools }: let # NOTE: On each glusterfs release, it should be checked if gluster added @@ -14,9 +14,9 @@ let # can help with finding new Python scripts. buildInputs = [ - fuse bison flex_2_5_35 openssl ncurses readline + fuse bison flex openssl ncurses readline autoconf automake libtool pkg-config zlib libaio libxml2 - acl sqlite liburcu attr makeWrapper util-linux libtirpc + acl sqlite liburcu attr makeWrapper util-linux libtirpc gperftools liburing (python3.withPackages (pkgs: [ pkgs.flask @@ -55,13 +55,13 @@ let ]; in stdenv.mkDerivation rec { pname = "glusterfs"; - version = "9.4"; + version = "10.0"; src = fetchFromGitHub { owner = "gluster"; repo = pname; rev = "v${version}"; - sha256 = "0ybs0dm7jskmfnmbg5fj8wi2aapbrwn4gbrx8ix6d8dzcl3pv78k"; + sha256 = "sha256-n6HdXs5kLbEI8Gaw2KBtO3i8hhadb+MsshUve/DOYg0="; }; inherit buildInputs propagatedBuildInputs; From 5a6e995a46ccb5e16c3c7ddba700c8d753b8ae41 Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Sat, 11 Dec 2021 23:38:40 +0100 Subject: [PATCH 035/104] nordzy-cursor-theme: init at 0.1.0 --- .../icons/nordzy-cursor-theme/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/data/icons/nordzy-cursor-theme/default.nix diff --git a/pkgs/data/icons/nordzy-cursor-theme/default.nix b/pkgs/data/icons/nordzy-cursor-theme/default.nix new file mode 100644 index 000000000000..7648a57474ae --- /dev/null +++ b/pkgs/data/icons/nordzy-cursor-theme/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchFromGitHub +, lib +}: + +stdenv.mkDerivation rec { + pname = "nordzy-cursor-theme"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "alvatip"; + repo = "Nordzy-cursors"; + rev = "v${version}"; + sha256 = "XabfKFyeII7Xl+ozzpPnc4xFH4B7GzCTLq4M1QPSZPw="; + }; + + installPhase = '' + mkdir -p $out/share/icons + + cp -r nordzy-dark/ $out/share/icons/Nordzy-cursors + mv $out/share/icons/Nordzy-cursors/index.theme $out/share/icons/Nordzy-cursors/cursor.theme + mv $out/share/icons/Nordzy-cursors/Nordzy-cursors $out/share/icons/Nordzy-cursors/cursors + cp -r nordzy-white/ $out/share/icons/Nordzy-white-cursors + mv $out/share/icons/Nordzy-white-cursors/index.theme $out/share/icons/Nordzy-white-cursors/cursor.theme + mv $out/share/icons/Nordzy-white-cursors/Nordzy-white-cursors $out/share/icons/Nordzy-white-cursors/cursors + ''; + + meta = with lib; { + description = "Cursor theme using the Nord color palette and based on Vimix and cz-Viator"; + homepage = "https://github.com/alvatip/Nordzy-cursors"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ + alexnortung + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98e18dbe8f39..ee72bb9ef2dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23542,6 +23542,8 @@ with pkgs; nordic = callPackage ../data/themes/nordic { }; + nordzy-cursor-theme = callPackage ../data/icons/nordzy-cursor-theme { }; + inherit (callPackages ../data/fonts/noto-fonts {}) noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-emoji-blob-bin noto-fonts-extra; From 445638d3ecdc239e62d78cfee776a01753d03e11 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Dec 2021 23:43:31 +0100 Subject: [PATCH 036/104] gdu: 5.12.0 -> 5.12.1 --- pkgs/tools/system/gdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index e70e82261595..a771e3967c80 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.12.0"; + version = "5.12.1"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GcipzV6TgJLXY5RgzFssaInBFIFORKr6wcZB6fD16OY="; + sha256 = "sha256-pXHMNyebUkHEZvUWtDkyp5Fqk07GA5sd+254fls8PjU="; }; vendorSha256 = "0ls0pw1m6hy203cdkmp9847h2fmvc4hjkv5x2v6r7516cqbs25ac"; From 6fab6f5665ffcd9afe70178dd7ea4ec0167bdb7f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Dec 2021 23:50:31 +0100 Subject: [PATCH 037/104] dnsrecon: 0.10.1 -> 1.0.0 --- pkgs/tools/security/dnsrecon/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix index 6fa2041de3c0..e3fe955eb9f1 100644 --- a/pkgs/tools/security/dnsrecon/default.nix +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -5,19 +5,20 @@ python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; - version = "0.10.1"; + version = "1.0.0"; + format = "other"; src = fetchFromGitHub { owner = "darkoperator"; repo = pname; rev = version; - sha256 = "1ysf8wx287psfk89r0i2vgnrjvxdj44s6nhf6sva59jbwvr9lghy"; + sha256 = "sha256-VRO5ugr/+iZh+hh3tVs/JNAr7GXao/HK43O3FlkbcSM="; }; - format = "other"; - - pythonPath = with python3.pkgs; [ - dnspython netaddr lxml + propagatedBuildInputs = with python3.pkgs; [ + dnspython + netaddr + lxml ]; postPatch = '' @@ -36,11 +37,11 @@ python3.pkgs.buildPythonApplication rec { runHook postInstall ''; + meta = with lib; { - description = "DNS Enumeration Script"; + description = "DNS Enumeration script"; homepage = "https://github.com/darkoperator/dnsrecon"; license = licenses.gpl2Only; - platforms = platforms.all; maintainers = with maintainers; [ c0bw3b fab ]; }; } From 20371fd18ce6f212ba921570ebe2a9b3d014e273 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Dec 2021 23:54:51 +0100 Subject: [PATCH 038/104] dnsrecon: 0.10.1 -> 1.0.0 --- pkgs/tools/security/dnsrecon/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix index 6fa2041de3c0..c16248023d74 100644 --- a/pkgs/tools/security/dnsrecon/default.nix +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -5,19 +5,20 @@ python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; - version = "0.10.1"; + version = "1.0.0"; + format = "other"; src = fetchFromGitHub { owner = "darkoperator"; repo = pname; rev = version; - sha256 = "1ysf8wx287psfk89r0i2vgnrjvxdj44s6nhf6sva59jbwvr9lghy"; + sha256 = "sha256-VRO5ugr/+iZh+hh3tVs/JNAr7GXao/HK43O3FlkbcSM="; }; - format = "other"; - - pythonPath = with python3.pkgs; [ - dnspython netaddr lxml + propagatedBuildInputs = with python3.pkgs; [ + dnspython + netaddr + lxml ]; postPatch = '' @@ -40,7 +41,6 @@ python3.pkgs.buildPythonApplication rec { description = "DNS Enumeration Script"; homepage = "https://github.com/darkoperator/dnsrecon"; license = licenses.gpl2Only; - platforms = platforms.all; maintainers = with maintainers; [ c0bw3b fab ]; }; } From 48feb21a3c2118c7eea3c28169c9a7349b556e74 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sat, 11 Dec 2021 15:04:00 -0800 Subject: [PATCH 039/104] unifi6: 6.5.53 -> 6.5.54 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index d73fd19cd84a..3d3ac89e6c0d 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -52,7 +52,7 @@ in rec { }; unifi6 = generic { - version = "6.5.53"; - sha256 = "0fk7xk3nhci0abvl1vfbjx3ajgw8qwb7f2rgzz8s8h5flhjjaysb"; + version = "6.5.54"; + sha256 = "sha256-M2gYqKZi0czFgfWx0tTW43b+aUVqS6Mg+misRB9/Fes="; }; } From cda7cc96039ce70b3bf1896f08c1b5a5a422a92b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Dec 2021 23:30:26 +0000 Subject: [PATCH 040/104] armadillo: 10.6.2 -> 10.7.4 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 6e9f67a9a33c..839a59edfe74 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.6.2"; + version = "10.7.4"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-KoA9b4921AfbnBXtw4lJZSOMjliflMyQeoNz7pRXKKg="; + sha256 = "sha256-LBsyxbJZsF40vC3N4cq1ic/LtYF5xyqTxdquoeOVBlI="; }; nativeBuildInputs = [ cmake ]; From 6e7c7e6b77565679451c3c4d5a65d1d466f2b8ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 00:49:27 +0000 Subject: [PATCH 041/104] argo: 3.1.1 -> 3.2.4 --- pkgs/applications/networking/cluster/argo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 6372f19ee6c7..b57181ce4a25 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.1.1"; + version = "3.2.4"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-WErNPofVnV6L7DkYU/dh4mWm+u7UJNFUmRN6IZzMb2g="; + sha256 = "sha256-uymE+Eq4jsqWIhDsbALzV+xAKF22DddPFzKtn3tV2EA="; }; - vendorSha256 = "sha256-99N//woGPx9QEtkFsktaiAbu7TS+3DHArBA52OUJFU4="; + vendorSha256 = "sha256-2b+PvD5IKgobBzFrubjRl2NvFxw91dXYpnWO8dqDG+U="; doCheck = false; From 23df95ff327c4f3bd4a2d4fd93f61d3fca870fc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 00:58:46 +0000 Subject: [PATCH 042/104] bibutils: 6.10 -> 7.2 --- pkgs/tools/misc/bibutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index 03b35811bc5b..66a518407025 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bibutils"; - version = "6.10"; + version = "7.2"; src = fetchurl { url = "mirror://sourceforge/bibutils/bibutils_${version}_src.tgz"; - sha256 = "15p4av74ihsg03j854dkdqihpspwnp58p9g1lhx48w8kz91c0ml6"; + sha256 = "sha256-bgKK7x6Kaz5azvCYWEp7tocI81z+dAEbNBwR/qXktcM="; }; preConfigure = lib.optionalString stdenv.isDarwin '' From c075119091be7f0985aab3c91887b1404130158b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 12 Dec 2021 00:37:06 +0000 Subject: [PATCH 043/104] ajour: 1.3.1 -> 1.3.2 Adds libEGL to rpath. --- pkgs/tools/games/ajour/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix index ed75e347db0b..49fef3edca9f 100644 --- a/pkgs/tools/games/ajour/default.nix +++ b/pkgs/tools/games/ajour/default.nix @@ -11,6 +11,7 @@ , kdialog , zenity , openssl +, libglvnd , libX11 , libxcb , libXcursor @@ -23,6 +24,7 @@ let rpathLibs = [ + libglvnd libXcursor libXi libxkbcommon @@ -34,16 +36,16 @@ let in rustPlatform.buildRustPackage rec { pname = "Ajour"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "casperstorm"; repo = "ajour"; rev = version; - sha256 = "sha256-tUm5d2JTvYyNFnKgId8mivWTB+v4TURZX293fMd11pk="; + sha256 = "sha256-oVaNLclU0EVNtxAASE8plXcC+clkwhBeb9pz1vXufV0="; }; - cargoSha256 = "sha256-SPmfXJLIA4OGEm/S2mi5xmIE9ng7hY3aHm/PCT7pg0E="; + cargoSha256 = "sha256-Q+wYBLsZN8YQtUJfrxmjImbnWRPmngJPB8sDG65LuJY="; nativeBuildInputs = [ autoPatchelfHook From b835bec4d74f47d802031cb129cd0abe6c5f95cc Mon Sep 17 00:00:00 2001 From: Joel Date: Sat, 11 Dec 2021 18:51:43 +1000 Subject: [PATCH 044/104] minecraft-server: 1.18 -> 1.18.1 (#149982) --- pkgs/games/minecraft-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 5d7506ba160b..02054f1ad8b5 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, nixosTests, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; - version = "1.18"; + version = "1.18.1"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/3cf24a8694aca6267883b17d934efacc5e44440d/server.jar"; + url = "https://launcher.mojang.com/v1/objects/125e5adf40c659fd3bce3e66e67a16bb49ecc1b9/server.jar"; # sha1 because that comes from mojang via api - sha1 = "3cf24a8694aca6267883b17d934efacc5e44440d"; + sha1 = "125e5adf40c659fd3bce3e66e67a16bb49ecc1b9"; }; preferLocalBuild = true; From ba32d993811bab54480f342394937be4f0cb32b6 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 12 Dec 2021 10:22:17 +1000 Subject: [PATCH 045/104] release: add cargo and go as unstable blockers for x86_64-{darwin,linux} Except for `go.x86_64-darwin` these are already implicit blockers on `nix{os,pkgs}-unstable` so this just improves visibility during `staging-next` cycles. https://hydra.nixos.org/job/nixpkgs/staging-next/unstable#tabs-constituents --- pkgs/top-level/release.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index fca5d3760942..e7d1b25b1376 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -95,6 +95,8 @@ let jobs.lib-tests jobs.pkgs-lib-tests jobs.stdenv.x86_64-linux + jobs.cargo.x86_64-linux + jobs.go.x86_64-linux jobs.linux.x86_64-linux jobs.pandoc.x86_64-linux jobs.python.x86_64-linux @@ -130,6 +132,8 @@ let ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools ++ lib.optionals supportDarwin [ jobs.stdenv.x86_64-darwin + jobs.cargo.x86_64-darwin + jobs.go.x86_64-darwin jobs.python.x86_64-darwin jobs.python3.x86_64-darwin jobs.nixpkgs-review.x86_64-darwin From 3aa4359254a62742ae9858bf25a4a51add4a3004 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 12 Dec 2021 12:33:07 +0800 Subject: [PATCH 046/104] pantheon.appcenter: re-add patch for disable packagekit backend It makes no sense to wait any longer as the app is totally not working specifically on NixOS. --- .../add-packagekit-backend-option.patch | 240 ++++++++++++++++++ .../pantheon/apps/appcenter/default.nix | 19 +- 2 files changed, 254 insertions(+), 5 deletions(-) create mode 100644 pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch diff --git a/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch b/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch new file mode 100644 index 000000000000..bd519c292c26 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch @@ -0,0 +1,240 @@ +From b5d7cb20713eff3b3729e5c5fdd2f15680a29385 Mon Sep 17 00:00:00 2001 +From: Bobby Rong +Date: Sun, 31 Oct 2021 23:12:46 +0800 +Subject: [PATCH] build: add packagekit_backend option + +--- + .github/workflows/main.yml | 7 +++++++ + meson_options.txt | 1 + + src/Application.vala | 4 ++++ + src/Core/BackendAggregator.vala | 2 ++ + src/Core/Package.vala | 21 +++++++++++++-------- + src/Core/UpdateManager.vala | 6 ++++++ + src/Views/Homepage.vala | 4 ++++ + src/meson.build | 10 ++++++++-- + 8 files changed, 45 insertions(+), 10 deletions(-) + +diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml +index daf13654..5dc5a2fb 100644 +--- a/.github/workflows/main.yml ++++ b/.github/workflows/main.yml +@@ -42,6 +42,13 @@ jobs: + meson configure -Dcurated=false -Dpayments=false -Dsharing=false -Dname=Pop\!_Shop build + ninja -C build install + ++ - name: Build (NixOS) ++ env: ++ DESTDIR: out ++ run: | ++ meson configure -Dcurated=false -Dpayments=false -Dpackagekit_backend=false build ++ ninja -C build install ++ + lint: + + runs-on: ubuntu-latest +diff --git a/meson_options.txt b/meson_options.txt +index 0ae93d07..37a6cd8a 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -4,3 +4,4 @@ option('name', type : 'string', value : 'AppCenter', description : 'The name of + option('payments', type : 'boolean', value : true, description : 'Enable payment features and display paid apps') + option('sharing', type : 'boolean', value : true, description : 'Display sharing features, i.e. copyable URLs to appcenter.elementary.io') + option('hide_upstream_distro_apps', type : 'boolean', value : true, description : 'Used for hiding Ubuntu repo apps on elementary OS') ++option('packagekit_backend', type : 'boolean', value : true, description : 'Enable PackageKit backend') +diff --git a/src/Application.vala b/src/Application.vala +index 65fae5aa..7c075076 100644 +--- a/src/Application.vala ++++ b/src/Application.vala +@@ -167,9 +167,11 @@ public class AppCenter.App : Gtk.Application { + + var client = AppCenterCore.Client.get_default (); + ++#if PACKAGEKIT_BACKEND + if (fake_update_packages != null) { + AppCenterCore.PackageKitBackend.get_default ().fake_packages = fake_update_packages; + } ++#endif + + if (silent) { + NetworkMonitor.get_default ().network_changed.connect ((available) => { +@@ -183,6 +185,7 @@ public class AppCenter.App : Gtk.Application { + return; + } + ++#if PACKAGEKIT_BACKEND + if (local_path != null) { + var file = File.new_for_commandline_arg (local_path); + +@@ -192,6 +195,7 @@ public class AppCenter.App : Gtk.Application { + warning ("Failed to load local AppStream XML file: %s", e.message); + } + } ++#endif + + if (main_window == null) { + main_window = new MainWindow (this); +diff --git a/src/Core/BackendAggregator.vala b/src/Core/BackendAggregator.vala +index 539dba98..feb1eaa9 100644 +--- a/src/Core/BackendAggregator.vala ++++ b/src/Core/BackendAggregator.vala +@@ -26,8 +26,10 @@ public class AppCenterCore.BackendAggregator : Backend, Object { + + construct { + backends = new Gee.ArrayList (); ++#if PACKAGEKIT_BACKEND + backends.add (PackageKitBackend.get_default ()); + backends.add (UbuntuDriversBackend.get_default ()); ++#endif + backends.add (FlatpakBackend.get_default ()); + + unowned Gtk.Application app = (Gtk.Application) GLib.Application.get_default (); +diff --git a/src/Core/Package.vala b/src/Core/Package.vala +index d6f12f15..8dbd7a22 100644 +--- a/src/Core/Package.vala ++++ b/src/Core/Package.vala +@@ -328,7 +328,14 @@ public class AppCenterCore.Package : Object { + public string origin_description { + owned get { + unowned string origin = component.get_origin (); +- if (backend is PackageKitBackend) { ++ if (backend is FlatpakBackend) { ++ var fp_package = this as FlatpakPackage; ++ if (fp_package != null && fp_package.installation == FlatpakBackend.system_installation) { ++ return _("%s (system-wide)").printf (origin); ++ } ++ return origin; ++#if PACKAGEKIT_BACKEND ++ } else if (backend is PackageKitBackend) { + if (origin == APPCENTER_PACKAGE_ORIGIN) { + return _("AppCenter"); + } else if (origin == ELEMENTARY_STABLE_PACKAGE_ORIGIN) { +@@ -336,15 +343,9 @@ public class AppCenterCore.Package : Object { + } else if (origin.has_prefix ("ubuntu-")) { + return _("Ubuntu (non-curated)"); + } +- } else if (backend is FlatpakBackend) { +- var fp_package = this as FlatpakPackage; +- if (fp_package != null && fp_package.installation == FlatpakBackend.system_installation) { +- return _("%s (system-wide)").printf (origin); +- } +- +- return origin; + } else if (backend is UbuntuDriversBackend) { + return _("Ubuntu Drivers"); ++#endif + } + + return _("Unknown Origin (non-curated)"); +@@ -434,11 +435,15 @@ public class AppCenterCore.Package : Object { + _author_title = null; + backend_details = null; + ++#if PACKAGEKIT_BACKEND + // The version on a PackageKit package comes from the package not AppStream, so only reset the version + // on other backends + if (!(backend is PackageKitBackend)) { + _latest_version = null; + } ++#else ++ _latest_version = null; ++#endif + + this.component = component; + } +diff --git a/src/Core/UpdateManager.vala b/src/Core/UpdateManager.vala +index 9deceaf5..c92c0d37 100644 +--- a/src/Core/UpdateManager.vala ++++ b/src/Core/UpdateManager.vala +@@ -52,6 +52,7 @@ public class AppCenterCore.UpdateManager : Object { + installed_package.update_state (); + } + ++#if PACKAGEKIT_BACKEND + Pk.Results pk_updates; + unowned PackageKitBackend client = PackageKitBackend.get_default (); + try { +@@ -60,10 +61,12 @@ public class AppCenterCore.UpdateManager : Object { + warning ("Unable to get updates from PackageKit backend: %s", e.message); + return 0; + } ++#endif + + uint os_count = 0; + string os_desc = ""; + ++#if PACKAGEKIT_BACKEND + var package_array = pk_updates.get_package_array (); + debug ("PackageKit backend reports %d updates", package_array.length); + +@@ -87,6 +90,7 @@ public class AppCenterCore.UpdateManager : Object { + ); + } + }); ++#endif + + os_updates.component.set_pkgnames ({}); + os_updates.change_information.clear_update_info (); +@@ -159,6 +163,7 @@ public class AppCenterCore.UpdateManager : Object { + count += 1; + } + ++#if PACKAGEKIT_BACKEND + pk_updates.get_details_array ().foreach ((pk_detail) => { + var pk_package = new Pk.Package (); + try { +@@ -181,6 +186,7 @@ public class AppCenterCore.UpdateManager : Object { + critical (e.message); + } + }); ++#endif + + os_updates.update_state (); + return count; +diff --git a/src/Views/Homepage.vala b/src/Views/Homepage.vala +index 3673903f..2e128e77 100644 +--- a/src/Views/Homepage.vala ++++ b/src/Views/Homepage.vala +@@ -107,9 +107,13 @@ public class AppCenter.Homepage : AbstractView { + column_spacing = 24, + orientation = Gtk.Orientation.VERTICAL + }; ++#if PACKAGEKIT_BACKEND + grid.add (banner_revealer); + grid.add (recently_updated_revealer); + grid.add (categories_label); ++#else ++ category_flow.margin_top = 12; ++#endif + grid.add (category_flow); + + scrolled_window = new Gtk.ScrolledWindow (null, null) { +diff --git a/src/meson.build b/src/meson.build +index 7b319fc6..d1d77931 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -12,10 +12,8 @@ appcenter_files = files( + 'Core/FlatpakBackend.vala', + 'Core/Job.vala', + 'Core/Package.vala', +- 'Core/PackageKitBackend.vala', + 'Core/ScreenshotCache.vala', + 'Core/Task.vala', +- 'Core/UbuntuDriversBackend.vala', + 'Core/UpdateManager.vala', + 'Dialogs/InstallFailDialog.vala', + 'Dialogs/NonCuratedWarningDialog.vala', +@@ -76,6 +74,14 @@ if get_option('hide_upstream_distro_apps') + args += '--define=HIDE_UPSTREAM_DISTRO_APPS' + endif + ++if get_option('packagekit_backend') ++ args += '--define=PACKAGEKIT_BACKEND' ++ appcenter_files += files( ++ 'Core/PackageKitBackend.vala', ++ 'Core/UbuntuDriversBackend.vala', ++ ) ++endif ++ + executable( + meson.project_name(), + appcenter_files, diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index d0c1cc970a7c..bdc2fbca591a 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -39,11 +39,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-xktIHQHmz5gh72NEz9UQ9fMvBlj1BihWxHgxsHmTIB0="; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; + patches = [ + # Introduces a packagekit_backend meson flag. + # Makes appcenter actually work by using only the flatpak backend. + # https://github.com/elementary/appcenter/pull/1739 + ./add-packagekit-backend-option.patch + ]; nativeBuildInputs = [ appstream-glib @@ -78,6 +79,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dpayments=false" "-Dcurated=false" + # This option is introduced in add-packagekit-backend-option.patch + "-Dpackagekit_backend=false" ]; postPatch = '' @@ -85,6 +88,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { homepage = "https://github.com/elementary/appcenter"; description = "An open, pay-what-you-want app store for indie developers, designed for elementary OS"; From 1eef9ae2d1274e97097b0ab38a18a6748cb87a20 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 12 Dec 2021 12:45:10 +0800 Subject: [PATCH 047/104] Revert "nixos/pantheon: cleanup FAQ section" This reverts commit cd58f44937a70b73447f464f1cb5a64badc78640. --- nixos/modules/services/x11/desktop-managers/pantheon.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.xml b/nixos/modules/services/x11/desktop-managers/pantheon.xml index 64933349e798..70cd7410c1e0 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.xml +++ b/nixos/modules/services/x11/desktop-managers/pantheon.xml @@ -107,6 +107,12 @@ switchboard-with-plugs.override { AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. The Flatpak backend will not work before flag for Flatpak-only is provided. See this issue. + + To use AppCenter on NixOS, add pantheon.appcenter to , enable Flatpak support and optionally add the appcenter Flatpak remote: + + +$ flatpak remote-add --if-not-exists appcenter https://flatpak.elementary.io/repo.flatpakrepo + From c65f6852e4f5b28e12406b1876956763ef1eb8cd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 12 Dec 2021 12:45:31 +0800 Subject: [PATCH 048/104] Revert "nixos/pantheon: mention latest appcenter changes in manual" This reverts commit d49d9a24b7b5b0ddfe349c355e79aa992c108a74. --- nixos/modules/services/x11/desktop-managers/pantheon.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.xml b/nixos/modules/services/x11/desktop-managers/pantheon.xml index 70cd7410c1e0..fe0a1c496223 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.xml +++ b/nixos/modules/services/x11/desktop-managers/pantheon.xml @@ -105,7 +105,7 @@ switchboard-with-plugs.override { - AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. The Flatpak backend will not work before flag for Flatpak-only is provided. See this issue. + AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. Starting from 21.11, the Flatpak backend should work so you can install some Flatpak applications using it. See this issue. To use AppCenter on NixOS, add pantheon.appcenter to , enable Flatpak support and optionally add the appcenter Flatpak remote: From 212182edf594a3374b89a117e4893db95a6a6723 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 04:51:30 +0000 Subject: [PATCH 049/104] python38Packages.deezer-python: 4.2.0 -> 4.2.1 --- pkgs/development/python-modules/deezer-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index ee47645ddc73..cb3afb644252 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "4.2.0"; + version = "4.2.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "v${version}"; - sha256 = "0wljf3ri8jcg4df6m61k8s5nm9rncwa8c46pfv901bc737kyslpl"; + sha256 = "0gl0l7x9zqfkz3l4jfz8rb956lqj3vx1aghric36izwzl6wyj6h5"; }; nativeBuildInputs = [ From 688235fb07757c7b17e2f58f069f3055351ccebd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 05:22:26 +0000 Subject: [PATCH 050/104] batsignal: 1.2.0 -> 1.3.1 --- pkgs/applications/misc/batsignal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index 93e16ea3469d..a8cbd24ee2c8 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "0yc7xgwb3i4m8m9kg2xspqig3s2qgh2i9bkalvnkziayjb7y59qn"; + sha256 = "sha256-ClwI3ZbkLul+l0zzzGxNjSOUTuVzIxtwUPNLOeFT2X0="; }; buildInputs = [ libnotify glib ]; From 31fd88293b0b04d75f3872907d686d737bb376af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 05:46:19 +0000 Subject: [PATCH 051/104] xsnow: 3.3.2 -> 3.3.6 --- pkgs/games/xsnow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index 416dc319aa1e..ee7cbd8fb48d 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "xsnow"; - version = "3.3.2"; + version = "3.3.6"; src = fetchurl { url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz"; - sha256 = "sha256-S9pyoDehOUr6Q/PjqH3/tkiyYpn6kHkYnuOQ3FhL44I="; + sha256 = "sha256-rTJO1btS1VBHatj9Yr2R6vZBUPQtCB1Aa6AD6IzwuLg="; }; nativeBuildInputs = [ pkg-config ]; From e06f742bebd4e125bc6f2426cc5b2c51a2b7b42a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 06:12:38 +0000 Subject: [PATCH 052/104] cinnamon.xviewer: 3.2.1 -> 3.2.2 --- pkgs/desktops/cinnamon/xviewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index 7b89ab2d5ab8..e8fb0f1f5c99 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "xviewer"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-9SUpJ76s3gf1852xnJh3Sz6SeuKhcGHtv+woiXztCS4="; + sha256 = "sha256-FFRms4yh7TQ/O3ee7igeIslimSWLhue3BE1xCrJ3NQ4="; }; nativeBuildInputs = [ From 1c55acf8cd116c0121dc2b7bba8cf246e07509d2 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 8 Dec 2021 00:52:45 +0100 Subject: [PATCH 053/104] mod-arpeggiator-lv2: init at unstable-2021-11-09 --- .../audio/mod-arpeggiator-lv2/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/audio/mod-arpeggiator-lv2/default.nix diff --git a/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix b/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix new file mode 100644 index 000000000000..3896545dc41c --- /dev/null +++ b/pkgs/applications/audio/mod-arpeggiator-lv2/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, lv2, pkg-config }: + +stdenv.mkDerivation rec { + + pname = "mod-arpeggiator-lv2"; + version = "unstable-2021-11-09"; + + src = fetchFromGitHub { + owner = "moddevices"; + repo = pname; + rev = "82f3d9f159ce216454656a8782362c3d5ed48bed"; + sha256 = "sha256-1KiWMTVTTf1/iR4AzJ1Oe0mOrWN5edsZN0tQMidgnRA="; + }; + + buildInputs = [ lv2 pkg-config ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "a LV2 arpeggiator"; + homepage = "https://github.com/moddevices/mod-arpeggiator-lv2"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 70346e33d185..fb9dd4ad45fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26555,6 +26555,8 @@ with pkgs; moc = callPackage ../applications/audio/moc { }; + mod-arpeggiator-lv2 = callPackage ../applications/audio/mod-arpeggiator-lv2 { }; + mod-distortion = callPackage ../applications/audio/mod-distortion { }; xmr-stak = callPackage ../applications/misc/xmr-stak { From 4da1c56ce2b4b5efc03df1e7ed49d25d1364be26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 07:51:52 +0000 Subject: [PATCH 054/104] wike: 1.6.2 -> 1.6.3 --- pkgs/applications/misc/wike/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/wike/default.nix b/pkgs/applications/misc/wike/default.nix index 0769470ca7fc..94875c6aaab6 100644 --- a/pkgs/applications/misc/wike/default.nix +++ b/pkgs/applications/misc/wike/default.nix @@ -14,13 +14,13 @@ let ]); in stdenv.mkDerivation rec { pname = "wike"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "hugolabe"; repo = "Wike"; rev = version; - sha256 = "sha256-23tmp0Cyr6O7Z2loLI0PHOxJGyE27RNmY7PoKBctt44="; + sha256 = "sha256-yyifRUf7oITV9lpnHnadZwHOKHr0Z+4bjCV/WoYs6vY="; }; nativeBuildInputs = [ From f3b234be9db3442a2e0e591d94b99daae0d359ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 08:01:49 +0000 Subject: [PATCH 055/104] vmpk: 0.8.4 -> 0.8.5 --- pkgs/applications/audio/vmpk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix index a9b1ac96f106..a68ed3ceae5d 100644 --- a/pkgs/applications/audio/vmpk/default.nix +++ b/pkgs/applications/audio/vmpk/default.nix @@ -5,11 +5,11 @@ mkDerivation rec { pname = "vmpk"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-SSdD8dyn6abti8qkd7N5n8EYr5yMW+EPYUnRm7S9CE4="; + sha256 = "sha256-SPome4UKGOWQLT9RMoGZ0wUdwodG8mSIaGFCg0i5CmY="; }; nativeBuildInputs = [ cmake pkg-config qttools docbook-xsl-nons ]; From 82c838356d86ee7305ddfdad3a7f3ca96c3fac2d Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Sun, 12 Dec 2021 05:41:38 -0300 Subject: [PATCH 056/104] skaffold: update sha256 for some reason, upstream changed it 2 days ago and build is failing https://github.com/GoogleContainerTools/skaffold/releases/tag/v1.35.1 --- pkgs/development/tools/skaffold/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 42aa91e9758b..31bc11cd84de 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "sha256-+VnZoZhBooLue+82zOngij8PpH9/wtZkYiyfklHSpsQ="; + sha256 = "sha256-8Ye2eR9eB7oyYOo46OraOxfLOG/XphWJkk+xPzDthPU="; }; vendorSha256 = "sha256-jr4HEs2mTRPNAiV/OWUnjYyQ1uSUJfVOTNCRi/18tEo="; From 6e6c3c5c92eb3a76f8e9f166fa9f0861cc7aa743 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Sun, 12 Dec 2021 05:44:01 -0300 Subject: [PATCH 057/104] skaffold: add myself as maintainer --- pkgs/development/tools/skaffold/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 31bc11cd84de..3f5f2f22777c 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -41,6 +41,6 @@ buildGoModule rec { It also provides building blocks and describe customizations for a CI/CD pipeline. ''; license = licenses.asl20; - maintainers = with maintainers; [ vdemeester ]; + maintainers = with maintainers; [ vdemeester bryanasdev000]; }; } From f552127eb37b00c58b5271f3e0c16d9c2fa12b85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 09:29:14 +0000 Subject: [PATCH 058/104] python38Packages.casbin: 1.13.0 -> 1.15.0 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index ed78e73db71f..944136840f63 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.13.0"; + version = "1.15.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "1qraxp0nij5412pvz9lvysb38px551arl29q06pd0z6rg1d8gdkx"; + sha256 = "05jg8qm0ix02qvcjqcfalp15j22hzlf9wfdnhrll57bnwgk4kkf8"; }; propagatedBuildInputs = [ From e992604bf0b4afb4c3e8ccad04d6ea69bba49681 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sat, 11 Dec 2021 15:04:24 -0800 Subject: [PATCH 059/104] nixos/unifi: Apply log4j2 mitigation --- nixos/modules/services/networking/unifi.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 53ad4df477fc..174e919f988b 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -7,6 +7,7 @@ let @${cfg.jrePackage}/bin/java java \ ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \ ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \ + ${optionalString (lib.versionOlder cfg.unifiPackage.version "6.5.54") "-Dlog4j2.formatMsgNoLookups=true"} \ -jar ${stateDir}/lib/ace.jar ''; in From c4dbe8fe65a04a282585811665caec1361e5fe51 Mon Sep 17 00:00:00 2001 From: Andreas Schmid Date: Sat, 11 Dec 2021 18:24:32 +0100 Subject: [PATCH 060/104] colima: init at 0.2.2 `colima` is a very easy usable replacement for Docker Desktop on MacOS. Signed-off-by: Andreas Schmid --- .../virtualization/colima/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/virtualization/colima/default.nix diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix new file mode 100644 index 000000000000..92e190168cf1 --- /dev/null +++ b/pkgs/applications/virtualization/colima/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, lima +, makeWrapper +}: + +buildGoModule rec { + pname = "colima"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "abiosoft"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-vWNkYsT2XF+oMOQ3pb1+/a207js8B+EmVanRQrYE/2A="; + }; + + nativeBuildInputs = [ installShellFiles makeWrapper ]; + + vendorSha256 = "sha256-F1ym88JrJWzsBg89Y1ufH4oefIRBwTGOw72BrjtpvBw="; + + postInstall = '' + wrapProgram $out/bin/colima \ + --prefix PATH : ${lib.makeBinPath [ lima ]} + + installShellCompletion --cmd colima \ + --bash <($out/bin/colima completion bash) \ + --fish <($out/bin/colima completion fish) \ + --zsh <($out/bin/colima completion zsh) + ''; + + meta = with lib; { + description = "Container runtimes on MacOS with minimal setup"; + homepage = "https://github.com/abiosoft/colima"; + license = licenses.mit; + platforms = platforms.darwin; + maintainers = with maintainers; [ aaschmid ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab718ee80159..8b40f026c9d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32479,6 +32479,8 @@ with pkgs; idsk = callPackage ../tools/filesystems/idsk { }; + colima = callPackage ../applications/virtualization/colima {}; + lima = callPackage ../applications/virtualization/lima {}; logtop = callPackage ../tools/misc/logtop { }; From 91c6a97243711446471fc8a576cb9d21f516641f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 12 Dec 2021 12:13:03 +1000 Subject: [PATCH 061/104] kubernetes: disable rbac tests timed out on hydra --- nixos/tests/kubernetes/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/tests/kubernetes/default.nix b/nixos/tests/kubernetes/default.nix index 90b73c68a76d..97931234fcc7 100644 --- a/nixos/tests/kubernetes/default.nix +++ b/nixos/tests/kubernetes/default.nix @@ -10,6 +10,8 @@ in { dns-single-node = dns.singlenode.test; dns-multi-node = dns.multinode.test; - rbac-single-node = rbac.singlenode.test; - rbac-multi-node = rbac.multinode.test; + # timed out: https://hydra.nixos.org/build/160710933 + #rbac-single-node = rbac.singlenode.test; + # timed out: https://hydra.nixos.org/build/160711286 + #rbac-multi-node = rbac.multinode.test; } From 65e4745989cc29314caec1548cf7a0923991f39b Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 8 Dec 2021 01:06:56 +0100 Subject: [PATCH 062/104] Surge-XT: unstable-2021-11-07 -> unstable-2021-12-11 surge-XT: fix crashing update version, make sure it doesn't try to write to home. update juce-lv2 version number --- pkgs/applications/audio/surge-XT/default.nix | 82 +++++++++++++++++--- 1 file changed, 71 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/applications/audio/surge-XT/default.nix index 6445723d7781..a08c25f016aa 100644 --- a/pkgs/applications/audio/surge-XT/default.nix +++ b/pkgs/applications/audio/surge-XT/default.nix @@ -1,28 +1,88 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, cairo, libxkbcommon, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor, alsa-lib, libjack2 +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, alsa-lib +, freetype +, libjack2 +, lv2 +, libX11 +, libXcursor +, libXext +, libXinerama +, libXrandr }: +let + juce-lv2 = stdenv.mkDerivation { + pname = "juce-lv2"; + version = "unstable-2021-12-11"; + + # lv2 branch + src = fetchFromGitHub { + owner = "lv2-porting-project"; + repo = "JUCE"; + rev = "5106d9d77b892c22afcb9379c13982f270429e2e"; + sha256 = "sha256-bpZJ5NEDRfMtmx0RkKQFZWqS/SnYAFRhrDg9MSphh4c="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + cp -r . $out + ''; + }; +in stdenv.mkDerivation rec { pname = "surge-XT"; - version = "unstable-2021-11-07"; + version = "unstable-2021-12-11"; src = fetchFromGitHub { owner = "surge-synthesizer"; repo = "surge"; - rev = "ed93833eb44b177c977e3a7b878ffdd9bf9f24e5"; - sha256 = "0b164659ksl6h5nn7jja5zccx2mwzibqs6b7hg8l98gpcy9fi5r2"; + rev = "320f68543d0279c11cea8dc7f5170399cccc9602"; fetchSubmodules = true; + sha256 = "sha256-Jcs5FpX5AZl72aKYNbRcfYqb2PRt0r1pQXk957xk0aM="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ cairo libxkbcommon xcbutilcursor xcbutilkeysyms xcbutil libXrandr libXinerama libXcursor alsa-lib libjack2 ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - installPhase = '' - cd .. - cmake --build build --config Release --target install + buildInputs = [ + alsa-lib + freetype + libjack2 + lv2 + libX11 + libXcursor + libXext + libXinerama + libXrandr + ]; + + cmakeFlags = [ + "-DJUCE_SUPPORTS_LV2=ON" + "-DSURGE_JUCE_PATH=${juce-lv2}" + ]; + + # JUCE dlopen's these at runtime, crashes without them + NIX_LDFLAGS = (toString [ + "-lX11" + "-lXext" + "-lXcursor" + "-lXinerama" + "-lXrandr" + ]); + + # see https://github.com/NixOS/nixpkgs/pull/149487#issuecomment-991747333 + postPatch = '' + export XDG_DOCUMENTS_DIR=$(mktemp -d) ''; - doInstallCheck = false; - meta = with lib; { description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)"; homepage = "https://surge-synthesizer.github.io"; From ad9c4bcf5286c3bcf220afd7fde96b6e4f40ef01 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 12 Dec 2021 12:00:06 +0100 Subject: [PATCH 063/104] zrythm: don't strip --- pkgs/applications/audio/zrythm/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix index 480684525b11..00af572215ee 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/applications/audio/zrythm/default.nix @@ -141,12 +141,15 @@ stdenv.mkDerivation rec { # "-Duser_manual=true" # needs sphinx-intl "-Dlsp_dsp=disabled" "-Db_lto=false" + "-Ddebug=true" ]; NIX_LDFLAGS = '' -lfftw3_threads -lfftw3f_threads ''; + dontStrip = true; + postPatch = '' chmod +x scripts/meson-post-install.sh patchShebangs ext/sh-manpage-completions/run.sh scripts/generic_guile_wrap.sh \ From a8aaaf5f62caf70376f4bacd9f55f1722b209279 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 11:49:29 +0000 Subject: [PATCH 064/104] tint2: 17.0.1 -> 17.0.2 --- pkgs/applications/misc/tint2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 308fbff1260d..131cb0f22ad8 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "tint2"; - version = "17.0.1"; + version = "17.0.2"; src = fetchFromGitLab { owner = "o9000"; repo = "tint2"; rev = version; - sha256 = "sha256-yiXdG0qYcdol2pA1L9ii4XiLZyyUAl8/EJop48OLoXs="; + sha256 = "sha256-SqpAjclwu3HN07LAZgvXGzjMK6G+nYLDdl90o1+9aog="; }; nativeBuildInputs = [ From 3c8f6c5407aab5b872892f24fdf82ef8076b2ec5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 12 Dec 2021 13:04:35 +0100 Subject: [PATCH 065/104] grafana: 8.3.1 -> 8.3.2, fix CVE-2021-43813, CVE-2021-43815 ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.3.2 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 31ba83b20f8a..23a7ae85cfeb 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGo117Module rec { pname = "grafana"; - version = "8.3.1"; + version = "8.3.2"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,12 +10,12 @@ buildGo117Module rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-KnTk14//uC8T6gqU6IvSQ28fL/h0THVAA6smTspZiVs="; + sha256 = "sha256-oPCeK9SHRpShAjLK3l8yMIwcrGvoUNjaeNNWZBjCIas="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-CX2F6yymmCvs6o7MtyhVrBGr9D6JSvakbWS7x3kiM5s="; + sha256 = "sha256-EA+SxQqmEvITBSxVWU5Ytot9pkG3UcXxRAA9cEcw0Yk="; }; vendorSha256 = "sha256-aS9yz0JODZtichaIkiBJLiMjbjGY93eSYwuactbRqOY="; From 150a6f4117487e15f67b4a2c62d046d09651446f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 12:12:48 +0000 Subject: [PATCH 066/104] syncthing: 1.18.4 -> 1.18.5 --- pkgs/applications/networking/syncthing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index d507dbc35bd8..bec35fdd5338 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.18.4"; + version = "1.18.5"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "14vq14gfqlqi1gg1psq9gs2i0ki6xlcfrjfcxi148hpaf38ly7pw"; + sha256 = "sha256-qGPAfNsl20+k5Gn0w6aY8VFSOmpPk7S5u4FHPrSCz80="; }; - vendorSha256 = "0qzbp35j49z52fd67ffznlmfpv1xcn0i3sbwvx3gqyfbw5ac0mlj"; + vendorSha256 = "sha256-klbAVOHLefxG33zpEYFlPezrKrXfuWOaE+UnIsu462M="; doCheck = false; From 4c764d4dbf217e48b2eaf54da4ec62c558f6cfd5 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 12 Dec 2021 13:23:08 +0100 Subject: [PATCH 067/104] shattered-pixel-dungeon: 1.0.0 -> 1.1.0 --- pkgs/games/shattered-pixel-dungeon/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index e67a9f6d470e..8dc205d51bc3 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -10,15 +10,15 @@ let pname = "shattered-pixel-dungeon"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; # NOTE: always use the commit sha, not the tag. Tags _will_ disappear! # https://github.com/00-Evan/shattered-pixel-dungeon/issues/596 - rev = "1f296a2d1088ad35421f5f8040a9f0803fa46ba8"; - sha256 = "sha256-MzHdUAzCR2JtIdY1SGuge3xgR6qIhNYxUPOxA+TZtLE="; + rev = "7f29a03078647ea503d3c866476568511aa5af84"; + sha256 = "sha256-+d8X7WFGX8YGb2rGu8jVO82QdlF9ec+6+Ti5wGEIwRg="; }; postPatch = '' @@ -47,7 +47,7 @@ let | sh ''; outputHashMode = "recursive"; - outputHash = "sha256-0P/BcjNnbDN25DguRcCyzPuUG7bouxEx1ySodIbSwvg="; + outputHash = "sha256-UI5/ZJbUtEz1Fr+qn6a8kzi9rrP+lVrpBbuDv8TG5y0="; }; in stdenv.mkDerivation rec { From 66352e3ee4b02927a57b708c32b8314b9df0d948 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 16 Nov 2021 22:04:47 +0100 Subject: [PATCH 068/104] chromium: Install vk_swiftshader_icd.json This should be required for Vulkan support via SwiftShader but I wasn't able to test/confirm it yet (according to strace Chromium never tried to load that file). The relevant flags for using Chromium with SwiftShader are documented at [0] and SwiftShader's ANGLE documentation [1] mentions the relevant files. See also [2], [3], and [4] for more details. [0]: https://source.chromium.org/chromium/chromium/src/+/master:docs/gpu/swiftshader.md;drc=046f987e020baba45ffb3061b3ee3d960d6ce981 [1]: https://github.com/google/swiftshader/blob/241349107851000f6a48c3d5769ed617785c8962/docs/ANGLE.md [2]: https://github.com/google/swiftshader/blob/241349107851000f6a48c3d5769ed617785c8962/README.md [3]: https://github.com/KhronosGroup/Vulkan-Loader/blob/ca9efe3f1ccd98a5fe05da71bf65087bcaa82f35/docs/LoaderInterfaceArchitecture.md [4]: https://bugs.archlinux.org/task/72652 --- pkgs/applications/networking/browsers/chromium/browser.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 96729f1dcda6..d28d797a879c 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -17,6 +17,7 @@ mkChromiumDerivation (base: rec { installPhase = '' mkdir -p "$libExecPath" cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" + cp -v "$buildPath/vk_swiftshader_icd.json" "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/" From 5e4b6df585a90f0661e953ae7583022b06ab8a24 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Dec 2021 13:55:21 +0100 Subject: [PATCH 069/104] python3Packages.ssdeep: enable tests --- .../python-modules/ssdeep/default.nix | 48 +++++++++++++------ pkgs/top-level/python-packages.nix | 4 +- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix index 510bbbac9518..6ad339a083f5 100644 --- a/pkgs/development/python-modules/ssdeep/default.nix +++ b/pkgs/development/python-modules/ssdeep/default.nix @@ -1,33 +1,51 @@ { lib , buildPythonPackage -, fetchPypi -, pkgs , cffi +, fetchFromGitHub +, pytestCheckHook , six -, pytest -, pytest-runner +, ssdeep }: buildPythonPackage rec { pname = "ssdeep"; version = "3.4"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "0px8k4fjbkjb717bg2v7rjhm4iclrxzq7sh0hfqs55f4ddqi0m8v"; + src = fetchFromGitHub { + owner = "DinoTools"; + repo = "python-ssdeep"; + rev = version; + hash = "sha256-eAB4/HmPGj/ngHrqkOlY/kTdY5iUEBHxrsRYjR/RNyw="; }; - buildInputs = [ pkgs.ssdeep pytest-runner ]; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ cffi six ]; + buildInputs = [ + ssdeep + ]; - # tests repository does not include required files - doCheck = false; + propagatedBuildInputs = [ + cffi + six + ]; + + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" + ''; + + pythonImportsCheck = [ + "ssdeep" + ]; meta = with lib; { - homepage = "https://github.com/DinoTools/python-ssdeep"; description = "Python wrapper for the ssdeep library"; - license = licenses.lgpl3; + homepage = "https://github.com/DinoTools/python-ssdeep"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ fab ]; }; - } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03afe1e7fe67..c98cbb5a11a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9091,7 +9091,9 @@ in { srvlookup = callPackage ../development/python-modules/srvlookup { }; - ssdeep = callPackage ../development/python-modules/ssdeep { }; + ssdeep = callPackage ../development/python-modules/ssdeep { + inherit (pkgs) ssdeep; + }; ssdp = callPackage ../development/python-modules/ssdp { }; From 74210c7b48dee7c34d0a998f60ce6e5e99423db8 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Sun, 12 Dec 2021 14:22:05 +0100 Subject: [PATCH 070/104] pythonPackages.pytmx: 3.30 -> 3.31 --- pkgs/development/python-modules/pytmx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytmx/default.nix b/pkgs/development/python-modules/pytmx/default.nix index e43cd8b06231..0fa38a9a6311 100644 --- a/pkgs/development/python-modules/pytmx/default.nix +++ b/pkgs/development/python-modules/pytmx/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytmx"; - version = "3.30"; + version = "3.31"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bitcraft"; repo = "PyTMX"; - rev = version; - sha256 = "sha256-d6VPmRdqUO6YhkOYYeXOEcrli/35IFkxK73AcZYHixw="; + rev = "v${version}"; + sha256 = "05v8zv06fymvgv332g48kcing4k4ncy2iwgpy1qmxrpin1avyynx"; }; propagatedBuildInputs = [ From 75af1116153e589b931280303e6098deaaf9c9e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 13:33:58 +0000 Subject: [PATCH 071/104] terragrunt: 0.35.13 -> 0.35.14 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 8de710b17876..7317fbb95a8c 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.35.13"; + version = "0.35.14"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-B+HdxnTm/LfGvabQiKhZVRIaMpg4zgCVYP8MkKiiSok="; + sha256 = "sha256-bK1xWzIowNF5gS4feRkCbTB1je/ttbmrqweaHplk8n8="; }; vendorSha256 = "sha256-tNgEepKqwiqXhmoRCIEg7VJw7Y0TGt+R+6dZzd8aECg="; From 0acfd0c1e179c1fa276fd931bdd22f207e7d5a48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 13:58:20 +0000 Subject: [PATCH 072/104] ugrep: 3.3.10 -> 3.3.12 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 8c0af2bf16fe..75b6d7dffff1 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.3.10"; + version = "3.3.12"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z+cNI/053/FFwNxYkbH5Zlp+BOWhP1o8xZ2LSmDaI5M="; + sha256 = "sha256-gQWLHZPU3pWgMpnl4BdgiWsml+meoN6lLP7KU9KluCc="; }; buildInputs = [ From a065cc0359071b0d4a5f92b37bb956682294ed1d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 15:15:05 +0000 Subject: [PATCH 073/104] tixati: 2.86 -> 2.87 --- pkgs/applications/networking/p2p/tixati/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 12528421fa86..4a0669d7d0af 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tixati"; - version = "2.86"; + version = "2.87"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "sha256-E5jZnjIdYRzkZ9hN7gKzIIjC0k2nN47yDptsMYrsvIA="; + sha256 = "sha256-URWLuZ/gtv/sX5+11ORu9SUZFIZUuKPn0CUQ1xaSQcQ="; }; installPhase = '' From 7810e5eb0ce067706234cc280f4576232a109e6f Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Sat, 11 Dec 2021 08:40:11 -0600 Subject: [PATCH 074/104] astromenace: 1.3.2 -> 1.4.1 --- pkgs/games/astromenace/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 16b087d1e4d0..556b276e210e 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -1,8 +1,8 @@ { fetchurl, lib, stdenv, cmake, xlibsWrapper, libGLU, libGL, SDL, openal, freealut, libogg, libvorbis, runtimeShell }: stdenv.mkDerivation rec { - version = "1.3.2"; pname = "astromenace"; + version = "1.4.1"; src = fetchurl { url = "mirror://sourceforge/openastromenace/astromenace-src-${version}.tar.bz2"; @@ -12,27 +12,29 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ xlibsWrapper libGLU libGL SDL openal freealut libogg libvorbis ]; - buildPhase = '' - cmake ./ - make + postBuild = '' ./AstroMenace --pack --rawdata=../RAW_VFS_DATA ''; + installPhase = '' mkdir -p $out/bin + cp AstroMenace $out cp gamedata.vfs $out + cat > $out/bin/AstroMenace << EOF #!${runtimeShell} $out/AstroMenace --dir=$out EOF + chmod 755 $out/bin/AstroMenace ''; - meta = { + meta = with lib; { description = "Hardcore 3D space shooter with spaceship upgrade possibilities"; homepage = "https://www.viewizard.com/"; - license = lib.licenses.gpl3; - platforms = lib.platforms.linux; + license = licenses.gpl3Plus; + platforms = platforms.linux; mainProgram = "AstroMenace"; }; } From 6871e40bbb769389645411d237cbbd791ab33e0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 15:23:35 +0000 Subject: [PATCH 075/104] texstudio: 4.1.1 -> 4.1.2 --- pkgs/applications/editors/texstudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 950fa79bb212..9d1a04128c00 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "sha256-zsZBqheHrjd17pXDIG0qWd7KI/zhNl3sQS5No0WvnBY="; + sha256 = "sha256-+HEA0IvWy0jvjFdU0sG9CzOKzysERMZBs/yHoE0I8B4="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; From 60a72578ff96e6a7c5166f62aadab08af389f04c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Dec 2021 22:06:40 +0000 Subject: [PATCH 076/104] ocrmypdf: 13.1.0 -> 13.1.1 --- pkgs/development/python-modules/ocrmypdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index ed5327c241d2..cea3ec26dd74 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "13.1.0"; + version = "13.1.1"; src = fetchFromGitHub { owner = "jbarlow83"; @@ -39,7 +39,7 @@ buildPythonPackage rec { extraPostFetch = '' rm "$out/.git_archival.txt" ''; - sha256 = "sha256-K8amHifxaR/tRiQODWVZcOd5nL5zzjd8C7h5whl/HoQ="; + sha256 = "sha256-NIh7eTsXQPNhrNWrTMFG7v4SFsicj1B4szEXcp5fXB4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 480fbd70487fb0e92480b53f9904300e03726ccd Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Sun, 12 Dec 2021 18:51:33 +0100 Subject: [PATCH 077/104] elmPackages.elm-git-install: init at 0.1.3 --- pkgs/development/compilers/elm/default.nix | 2 +- .../compilers/elm/packages/node-packages.json | 3 +- .../compilers/elm/packages/node-packages.nix | 1242 +++++++++-------- 3 files changed, 646 insertions(+), 601 deletions(-) diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index a4b0d12fd8b7..d63c6ff05968 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -215,7 +215,7 @@ let }; }; - inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse; + inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse elm-git-install; }; in hsPkgs.elmPkgs // elmNodePackages // elmRustPackages // { diff --git a/pkgs/development/compilers/elm/packages/node-packages.json b/pkgs/development/compilers/elm/packages/node-packages.json index b5c7216645b5..4adbebb53fdd 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.json +++ b/pkgs/development/compilers/elm/packages/node-packages.json @@ -10,5 +10,6 @@ "elm-xref", "create-elm-app", "elm-optimize-level-2", - "elm-review" + "elm-review", + "elm-git-install" ] diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index 6bc92789e070..c2b5c5a07dc3 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -22,22 +22,22 @@ let sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="; }; }; - "@babel/code-frame-7.15.8" = { + "@babel/code-frame-7.16.0" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.15.8"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.15.8.tgz"; - sha512 = "2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz"; + sha512 = "IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA=="; }; }; - "@babel/compat-data-7.15.0" = { + "@babel/compat-data-7.16.4" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.15.0"; + version = "7.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz"; - sha512 = "0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz"; + sha512 = "1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q=="; }; }; "@babel/core-7.12.10" = { @@ -49,130 +49,130 @@ let sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; }; }; - "@babel/generator-7.15.8" = { + "@babel/generator-7.16.0" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.15.8"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz"; - sha512 = "ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.0.tgz"; + sha512 = "RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew=="; }; }; - "@babel/helper-annotate-as-pure-7.15.4" = { + "@babel/helper-annotate-as-pure-7.16.0" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz"; - sha512 = "QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz"; + sha512 = "ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.16.0" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz"; - sha512 = "P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.0.tgz"; + sha512 = "9KuleLT0e77wFUku6TUkqZzCEymBdtuQQ27MhEKzf9UOOJu3cYj98kyaDAzxpC7lV6DGiZFuC8XqDsq8/Kl6aQ=="; }; }; - "@babel/helper-compilation-targets-7.15.4" = { + "@babel/helper-compilation-targets-7.16.3" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.15.4"; + version = "7.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz"; - sha512 = "rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz"; + sha512 = "vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA=="; }; }; - "@babel/helper-create-class-features-plugin-7.15.4" = { + "@babel/helper-create-class-features-plugin-7.16.0" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz"; - sha512 = "7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.0.tgz"; + sha512 = "XLwWvqEaq19zFlF5PTgOod4bUA+XbkR4WLQBct1bkzmxJGB0ZEJaoKF4c8cgH9oBtCDuYJ8BP5NB9uFiEgO5QA=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.14.5" = { + "@babel/helper-create-regexp-features-plugin-7.16.0" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz"; - sha512 = "TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz"; + sha512 = "3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA=="; }; }; - "@babel/helper-explode-assignable-expression-7.15.4" = { + "@babel/helper-explode-assignable-expression-7.16.0" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz"; - sha512 = "J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz"; + sha512 = "Hk2SLxC9ZbcOhLpg/yMznzJ11W++lg5GMbxt1ev6TXUiJB0N42KPC+7w8a+eWGuqDnUYuwStJoZHM7RgmIOaGQ=="; }; }; - "@babel/helper-function-name-7.15.4" = { + "@babel/helper-function-name-7.16.0" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz"; - sha512 = "Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz"; + sha512 = "BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog=="; }; }; - "@babel/helper-get-function-arity-7.15.4" = { + "@babel/helper-get-function-arity-7.16.0" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz"; - sha512 = "1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz"; + sha512 = "ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ=="; }; }; - "@babel/helper-hoist-variables-7.15.4" = { + "@babel/helper-hoist-variables-7.16.0" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz"; - sha512 = "VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz"; + sha512 = "1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg=="; }; }; - "@babel/helper-member-expression-to-functions-7.15.4" = { + "@babel/helper-member-expression-to-functions-7.16.0" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz"; - sha512 = "cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz"; + sha512 = "bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ=="; }; }; - "@babel/helper-module-imports-7.15.4" = { + "@babel/helper-module-imports-7.16.0" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz"; - sha512 = "jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz"; + sha512 = "kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg=="; }; }; - "@babel/helper-module-transforms-7.15.8" = { + "@babel/helper-module-transforms-7.16.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.15.8"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz"; - sha512 = "DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz"; + sha512 = "My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA=="; }; }; - "@babel/helper-optimise-call-expression-7.15.4" = { + "@babel/helper-optimise-call-expression-7.16.0" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz"; - sha512 = "E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz"; + sha512 = "SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw=="; }; }; "@babel/helper-plugin-utils-7.14.5" = { @@ -184,49 +184,49 @@ let sha512 = "/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="; }; }; - "@babel/helper-remap-async-to-generator-7.15.4" = { + "@babel/helper-remap-async-to-generator-7.16.4" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.15.4"; + version = "7.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz"; - sha512 = "v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.4.tgz"; + sha512 = "vGERmmhR+s7eH5Y/cp8PCVzj4XEjerq8jooMfxFdA5xVtAk9Sh4AQsrWgiErUEBjtGrBtOFKDUcWQFW4/dFwMA=="; }; }; - "@babel/helper-replace-supers-7.15.4" = { + "@babel/helper-replace-supers-7.16.0" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz"; - sha512 = "/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz"; + sha512 = "TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA=="; }; }; - "@babel/helper-simple-access-7.15.4" = { + "@babel/helper-simple-access-7.16.0" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz"; - sha512 = "UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz"; + sha512 = "o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.15.4" = { + "@babel/helper-skip-transparent-expression-wrappers-7.16.0" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz"; - sha512 = "BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz"; + sha512 = "+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw=="; }; }; - "@babel/helper-split-export-declaration-7.15.4" = { + "@babel/helper-split-export-declaration-7.16.0" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz"; - sha512 = "HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz"; + sha512 = "0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw=="; }; }; "@babel/helper-validator-identifier-7.15.7" = { @@ -247,157 +247,157 @@ let sha512 = "OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="; }; }; - "@babel/helper-wrap-function-7.15.4" = { + "@babel/helper-wrap-function-7.16.0" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz"; - sha512 = "Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.0.tgz"; + sha512 = "VVMGzYY3vkWgCJML+qVLvGIam902mJW0FvT7Avj1zEe0Gn7D93aWdLblYARTxEw+6DhZmtzhBM2zv0ekE5zg1g=="; }; }; - "@babel/helpers-7.15.4" = { + "@babel/helpers-7.16.3" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.15.4"; + version = "7.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz"; - sha512 = "V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.3.tgz"; + sha512 = "Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w=="; }; }; - "@babel/highlight-7.14.5" = { + "@babel/highlight-7.16.0" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz"; - sha512 = "qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz"; + sha512 = "t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g=="; }; }; - "@babel/parser-7.15.8" = { + "@babel/parser-7.16.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.15.8"; + version = "7.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.8.tgz"; - sha512 = "BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz"; + sha512 = "6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.15.8" = { + "@babel/plugin-proposal-async-generator-functions-7.16.4" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.15.8"; + version = "7.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.8.tgz"; - sha512 = "2Z5F2R2ibINTc63mY7FLqGfEbmofrHU9FitJW1Q7aPaKFhiPvSq6QEt/BoWN5oME3GVyjcRuNNSRbb9LC0CSWA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.4.tgz"; + sha512 = "/CUekqaAaZCQHleSK/9HajvcD/zdnJiKRiuUFq8ITE+0HsPzquf53cpFiqAwl/UfmJbR6n5uGPQSPdrmKOvHHg=="; }; }; - "@babel/plugin-proposal-class-properties-7.14.5" = { + "@babel/plugin-proposal-class-properties-7.16.0" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz"; - sha512 = "q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.0.tgz"; + sha512 = "mCF3HcuZSY9Fcx56Lbn+CGdT44ioBMMvjNVldpKtj8tpniETdLjnxdHI1+sDWXIM1nNt+EanJOZ3IG9lzVjs7A=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.14.5" = { + "@babel/plugin-proposal-dynamic-import-7.16.0" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz"; - sha512 = "ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.0.tgz"; + sha512 = "QGSA6ExWk95jFQgwz5GQ2Dr95cf7eI7TKutIXXTb7B1gCLTCz5hTjFTQGfLFBBiC5WSNi7udNwWsqbbMh1c4yQ=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.14.5" = { + "@babel/plugin-proposal-export-namespace-from-7.16.0" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz"; - sha512 = "g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.0.tgz"; + sha512 = "CjI4nxM/D+5wCnhD11MHB1AwRSAYeDT+h8gCdcVJZ/OK7+wRzFsf7PFPWVpVpNRkHMmMkQWAHpTq+15IXQ1diA=="; }; }; - "@babel/plugin-proposal-json-strings-7.14.5" = { + "@babel/plugin-proposal-json-strings-7.16.0" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz"; - sha512 = "NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.0.tgz"; + sha512 = "kouIPuiv8mSi5JkEhzApg5Gn6hFyKPnlkO0a9YSzqRurH8wYzSlf6RJdzluAsbqecdW5pBvDJDfyDIUR/vLxvg=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.14.5" = { + "@babel/plugin-proposal-logical-assignment-operators-7.16.0" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz"; - sha512 = "YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.0.tgz"; + sha512 = "pbW0fE30sVTYXXm9lpVQQ/Vc+iTeQKiXlaNRZPPN2A2VdlWyAtsUrsQ3xydSlDW00TFMK7a8m3cDTkBF5WnV3Q=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.16.0" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz"; - sha512 = "gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.0.tgz"; + sha512 = "3bnHA8CAFm7cG93v8loghDYyQ8r97Qydf63BeYiGgYbjKKB/XP53W15wfRC7dvKfoiJ34f6Rbyyx2btExc8XsQ=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.14.5" = { + "@babel/plugin-proposal-numeric-separator-7.16.0" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz"; - sha512 = "yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.0.tgz"; + sha512 = "FAhE2I6mjispy+vwwd6xWPyEx3NYFS13pikDBWUAFGZvq6POGs5eNchw8+1CYoEgBl9n11I3NkzD7ghn25PQ9Q=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.15.6" = { + "@babel/plugin-proposal-object-rest-spread-7.16.0" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.15.6"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz"; - sha512 = "qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.0.tgz"; + sha512 = "LU/+jp89efe5HuWJLmMmFG0+xbz+I2rSI7iLc1AlaeSMDMOGzWlc5yJrMN1d04osXN4sSfpo4O+azkBNBes0jg=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.14.5" = { + "@babel/plugin-proposal-optional-catch-binding-7.16.0" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz"; - sha512 = "3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.0.tgz"; + sha512 = "kicDo0A/5J0nrsCPbn89mTG3Bm4XgYi0CZtvex9Oyw7gGZE3HXGD0zpQNH+mo+tEfbo8wbmMvJftOwpmPy7aVw=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.14.5" = { + "@babel/plugin-proposal-optional-chaining-7.16.0" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz"; - sha512 = "ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.0.tgz"; + sha512 = "Y4rFpkZODfHrVo70Uaj6cC1JJOt3Pp0MdWSwIKtb8z1/lsjl9AmnB7ErRFV+QNGIfcY1Eruc2UMx5KaRnXjMyg=="; }; }; - "@babel/plugin-proposal-private-methods-7.14.5" = { + "@babel/plugin-proposal-private-methods-7.16.0" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz"; - sha512 = "838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.0.tgz"; + sha512 = "IvHmcTHDFztQGnn6aWq4t12QaBXTKr1whF/dgp9kz84X6GUcwq9utj7z2wFCUfeOup/QKnOlt2k0zxkGFx9ubg=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.14.5" = { + "@babel/plugin-proposal-unicode-property-regex-7.16.0" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz"; - sha512 = "6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.0.tgz"; + sha512 = "ti7IdM54NXv29cA4+bNNKEMS4jLMCbJgl+Drv+FgYy0erJLAxNAIXcNjNjrRZEcWq0xJHsNVwQezskMFpF8N9g=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -508,229 +508,229 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-transform-arrow-functions-7.14.5" = { + "@babel/plugin-transform-arrow-functions-7.16.0" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz"; - sha512 = "KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.0.tgz"; + sha512 = "vIFb5250Rbh7roWARvCLvIJ/PtAU5Lhv7BtZ1u24COwpI9Ypjsh+bZcKk6rlIyalK+r0jOc1XQ8I4ovNxNrWrA=="; }; }; - "@babel/plugin-transform-async-to-generator-7.14.5" = { + "@babel/plugin-transform-async-to-generator-7.16.0" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz"; - sha512 = "szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.0.tgz"; + sha512 = "PbIr7G9kR8tdH6g8Wouir5uVjklETk91GMVSUq+VaOgiinbCkBP6Q7NN/suM/QutZkMJMvcyAriogcYAdhg8Gw=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.14.5" = { + "@babel/plugin-transform-block-scoped-functions-7.16.0" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz"; - sha512 = "dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.0.tgz"; + sha512 = "V14As3haUOP4ZWrLJ3VVx5rCnrYhMSHN/jX7z6FAt5hjRkLsb0snPCmJwSOML5oxkKO4FNoNv7V5hw/y2bjuvg=="; }; }; - "@babel/plugin-transform-block-scoping-7.15.3" = { + "@babel/plugin-transform-block-scoping-7.16.0" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.15.3"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz"; - sha512 = "nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.0.tgz"; + sha512 = "27n3l67/R3UrXfizlvHGuTwsRIFyce3D/6a37GRxn28iyTPvNXaW4XvznexRh1zUNLPjbLL22Id0XQElV94ruw=="; }; }; - "@babel/plugin-transform-classes-7.15.4" = { + "@babel/plugin-transform-classes-7.16.0" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz"; - sha512 = "Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.0.tgz"; + sha512 = "HUxMvy6GtAdd+GKBNYDWCIA776byUQH8zjnfjxwT1P1ARv/wFu8eBDpmXQcLS/IwRtrxIReGiplOwMeyO7nsDQ=="; }; }; - "@babel/plugin-transform-computed-properties-7.14.5" = { + "@babel/plugin-transform-computed-properties-7.16.0" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz"; - sha512 = "pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.0.tgz"; + sha512 = "63l1dRXday6S8V3WFY5mXJwcRAnPYxvFfTlt67bwV1rTyVTM5zrp0DBBb13Kl7+ehkCVwIZPumPpFP/4u70+Tw=="; }; }; - "@babel/plugin-transform-destructuring-7.14.7" = { + "@babel/plugin-transform-destructuring-7.16.0" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.14.7"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz"; - sha512 = "0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.0.tgz"; + sha512 = "Q7tBUwjxLTsHEoqktemHBMtb3NYwyJPTJdM+wDwb0g8PZ3kQUIzNvwD5lPaqW/p54TXBc/MXZu9Jr7tbUEUM8Q=="; }; }; - "@babel/plugin-transform-dotall-regex-7.14.5" = { + "@babel/plugin-transform-dotall-regex-7.16.0" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz"; - sha512 = "loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.0.tgz"; + sha512 = "FXlDZfQeLILfJlC6I1qyEwcHK5UpRCFkaoVyA1nk9A1L1Yu583YO4un2KsLBsu3IJb4CUbctZks8tD9xPQubLw=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.14.5" = { + "@babel/plugin-transform-duplicate-keys-7.16.0" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz"; - sha512 = "iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.0.tgz"; + sha512 = "LIe2kcHKAZOJDNxujvmp6z3mfN6V9lJxubU4fJIGoQCkKe3Ec2OcbdlYP+vW++4MpxwG0d1wSDOJtQW5kLnkZQ=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.14.5" = { + "@babel/plugin-transform-exponentiation-operator-7.16.0" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz"; - sha512 = "jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.0.tgz"; + sha512 = "OwYEvzFI38hXklsrbNivzpO3fh87skzx8Pnqi4LoSYeav0xHlueSoCJrSgTPfnbyzopo5b3YVAJkFIcUpK2wsw=="; }; }; - "@babel/plugin-transform-for-of-7.15.4" = { + "@babel/plugin-transform-for-of-7.16.0" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz"; - sha512 = "DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.0.tgz"; + sha512 = "5QKUw2kO+GVmKr2wMYSATCTTnHyscl6sxFRAY+rvN7h7WB0lcG0o4NoV6ZQU32OZGVsYUsfLGgPQpDFdkfjlJQ=="; }; }; - "@babel/plugin-transform-function-name-7.14.5" = { + "@babel/plugin-transform-function-name-7.16.0" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz"; - sha512 = "vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.0.tgz"; + sha512 = "lBzMle9jcOXtSOXUpc7tvvTpENu/NuekNJVova5lCCWCV9/U1ho2HH2y0p6mBg8fPm/syEAbfaaemYGOHCY3mg=="; }; }; - "@babel/plugin-transform-literals-7.14.5" = { + "@babel/plugin-transform-literals-7.16.0" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz"; - sha512 = "ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.0.tgz"; + sha512 = "gQDlsSF1iv9RU04clgXqRjrPyyoJMTclFt3K1cjLmTKikc0s/6vE3hlDeEVC71wLTRu72Fq7650kABrdTc2wMQ=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.14.5" = { + "@babel/plugin-transform-member-expression-literals-7.16.0" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz"; - sha512 = "WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.0.tgz"; + sha512 = "WRpw5HL4Jhnxw8QARzRvwojp9MIE7Tdk3ez6vRyUk1MwgjJN0aNpRoXainLR5SgxmoXx/vsXGZ6OthP6t/RbUg=="; }; }; - "@babel/plugin-transform-modules-amd-7.14.5" = { + "@babel/plugin-transform-modules-amd-7.16.0" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz"; - sha512 = "3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.0.tgz"; + sha512 = "rWFhWbCJ9Wdmzln1NmSCqn7P0RAD+ogXG/bd9Kg5c7PKWkJtkiXmYsMBeXjDlzHpVTJ4I/hnjs45zX4dEv81xw=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.15.4" = { + "@babel/plugin-transform-modules-commonjs-7.16.0" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz"; - sha512 = "qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.0.tgz"; + sha512 = "Dzi+NWqyEotgzk/sb7kgQPJQf7AJkQBWsVp1N6JWc1lBVo0vkElUnGdr1PzUBmfsCCN5OOFya3RtpeHk15oLKQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.15.4" = { + "@babel/plugin-transform-modules-systemjs-7.16.0" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz"; - sha512 = "fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.0.tgz"; + sha512 = "yuGBaHS3lF1m/5R+6fjIke64ii5luRUg97N2wr+z1sF0V+sNSXPxXDdEEL/iYLszsN5VKxVB1IPfEqhzVpiqvg=="; }; }; - "@babel/plugin-transform-modules-umd-7.14.5" = { + "@babel/plugin-transform-modules-umd-7.16.0" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz"; - sha512 = "RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.0.tgz"; + sha512 = "nx4f6no57himWiHhxDM5pjwhae5vLpTK2zCnDH8+wNLJy0TVER/LJRHl2bkt6w9Aad2sPD5iNNoUpY3X9sTGDg=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.14.9" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.16.0" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.14.9"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz"; - sha512 = "l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.0.tgz"; + sha512 = "LogN88uO+7EhxWc8WZuQ8vxdSyVGxhkh8WTC3tzlT8LccMuQdA81e9SGV6zY7kY2LjDhhDOFdQVxdGwPyBCnvg=="; }; }; - "@babel/plugin-transform-new-target-7.14.5" = { + "@babel/plugin-transform-new-target-7.16.0" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz"; - sha512 = "Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.0.tgz"; + sha512 = "fhjrDEYv2DBsGN/P6rlqakwRwIp7rBGLPbrKxwh7oVt5NNkIhZVOY2GRV+ULLsQri1bDqwDWnU3vhlmx5B2aCw=="; }; }; - "@babel/plugin-transform-object-super-7.14.5" = { + "@babel/plugin-transform-object-super-7.16.0" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz"; - sha512 = "MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.0.tgz"; + sha512 = "fds+puedQHn4cPLshoHcR1DTMN0q1V9ou0mUjm8whx9pGcNvDrVVrgw+KJzzCaiTdaYhldtrUps8DWVMgrSEyg=="; }; }; - "@babel/plugin-transform-parameters-7.15.4" = { + "@babel/plugin-transform-parameters-7.16.3" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.15.4"; + version = "7.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz"; - sha512 = "9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.3.tgz"; + sha512 = "3MaDpJrOXT1MZ/WCmkOFo7EtmVVC8H4EUZVrHvFOsmwkk4lOjQj8rzv8JKUZV4YoQKeoIgk07GO+acPU9IMu/w=="; }; }; - "@babel/plugin-transform-property-literals-7.14.5" = { + "@babel/plugin-transform-property-literals-7.16.0" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz"; - sha512 = "r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.0.tgz"; + sha512 = "XLldD4V8+pOqX2hwfWhgwXzGdnDOThxaNTgqagOcpBgIxbUvpgU2FMvo5E1RyHbk756WYgdbS0T8y0Cj9FKkWQ=="; }; }; - "@babel/plugin-transform-regenerator-7.14.5" = { + "@babel/plugin-transform-regenerator-7.16.0" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz"; - sha512 = "NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.0.tgz"; + sha512 = "JAvGxgKuwS2PihiSFaDrp94XOzzTUeDeOQlcKzVAyaPap7BnZXK/lvMDiubkPTdotPKOIZq9xWXWnggUMYiExg=="; }; }; - "@babel/plugin-transform-reserved-words-7.14.5" = { + "@babel/plugin-transform-reserved-words-7.16.0" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz"; - sha512 = "cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.0.tgz"; + sha512 = "Dgs8NNCehHSvXdhEhln8u/TtJxfVwGYCgP2OOr5Z3Ar+B+zXicEOKNTyc+eca2cuEOMtjW6m9P9ijOt8QdqWkg=="; }; }; "@babel/plugin-transform-runtime-7.12.10" = { @@ -742,67 +742,67 @@ let sha512 = "xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.14.5" = { + "@babel/plugin-transform-shorthand-properties-7.16.0" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz"; - sha512 = "xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.0.tgz"; + sha512 = "iVb1mTcD8fuhSv3k99+5tlXu5N0v8/DPm2mO3WACLG6al1CGZH7v09HJyUb1TtYl/Z+KrM6pHSIJdZxP5A+xow=="; }; }; - "@babel/plugin-transform-spread-7.15.8" = { + "@babel/plugin-transform-spread-7.16.0" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.15.8"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.15.8.tgz"; - sha512 = "/daZ8s2tNaRekl9YJa9X4bzjpeRZLt122cpgFnQPLGUe61PH8zMEBmYqKkW5xF5JUEh5buEGXJoQpqBmIbpmEQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.0.tgz"; + sha512 = "Ao4MSYRaLAQczZVp9/7E7QHsCuK92yHRrmVNRe/SlEJjhzivq0BSn8mEraimL8wizHZ3fuaHxKH0iwzI13GyGg=="; }; }; - "@babel/plugin-transform-sticky-regex-7.14.5" = { + "@babel/plugin-transform-sticky-regex-7.16.0" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz"; - sha512 = "Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.0.tgz"; + sha512 = "/ntT2NljR9foobKk4E/YyOSwcGUXtYWv5tinMK/3RkypyNBNdhHUaq6Orw5DWq9ZcNlS03BIlEALFeQgeVAo4Q=="; }; }; - "@babel/plugin-transform-template-literals-7.14.5" = { + "@babel/plugin-transform-template-literals-7.16.0" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz"; - sha512 = "22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.0.tgz"; + sha512 = "Rd4Ic89hA/f7xUSJQk5PnC+4so50vBoBfxjdQAdvngwidM8jYIBVxBZ/sARxD4e0yMXRbJVDrYf7dyRtIIKT6Q=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.14.5" = { + "@babel/plugin-transform-typeof-symbol-7.16.0" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz"; - sha512 = "lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.0.tgz"; + sha512 = "++V2L8Bdf4vcaHi2raILnptTBjGEFxn5315YU+e8+EqXIucA+q349qWngCLpUYqqv233suJ6NOienIVUpS9cqg=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.14.5" = { + "@babel/plugin-transform-unicode-escapes-7.16.0" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz"; - sha512 = "crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.0.tgz"; + sha512 = "VFi4dhgJM7Bpk8lRc5CMaRGlKZ29W9C3geZjt9beuzSUrlJxsNwX7ReLwaL6WEvsOf2EQkyIJEPtF8EXjB/g2A=="; }; }; - "@babel/plugin-transform-unicode-regex-7.14.5" = { + "@babel/plugin-transform-unicode-regex-7.16.0" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.14.5"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz"; - sha512 = "UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.0.tgz"; + sha512 = "jHLK4LxhHjvCeZDWyA9c+P9XH1sOxRd1RO9xMtDVRAOND/PczPqizEtVdx4TQF/wyPaewqpT+tgQFYMnN/P94A=="; }; }; "@babel/preset-env-7.12.10" = { @@ -832,31 +832,31 @@ let sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg=="; }; }; - "@babel/template-7.15.4" = { + "@babel/template-7.16.0" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.15.4"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz"; - sha512 = "UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.16.0.tgz"; + sha512 = "MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A=="; }; }; - "@babel/traverse-7.15.4" = { + "@babel/traverse-7.16.3" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.15.4"; + version = "7.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz"; - sha512 = "W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.3.tgz"; + sha512 = "eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag=="; }; }; - "@babel/types-7.15.6" = { + "@babel/types-7.16.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.15.6"; + version = "7.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz"; - sha512 = "BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz"; + sha512 = "PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg=="; }; }; "@hapi/address-2.1.4" = { @@ -1057,13 +1057,13 @@ let sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; }; - "@types/node-16.11.4" = { + "@types/node-16.11.12" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.4"; + version = "16.11.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.4.tgz"; - sha512 = "TMgXmy0v2xWyuCSCJM6NCna2snndD8yvQF67J29ipdzMcsPa9u+o0tjF5+EQNdhcuZplYuouYqpc4zcd5I6amQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz"; + sha512 = "+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw=="; }; }; "@types/parse-json-4.0.0" = { @@ -1120,13 +1120,13 @@ let sha512 = "O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ=="; }; }; - "@types/webpack-4.41.31" = { + "@types/webpack-4.41.32" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.31"; + version = "4.41.32"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.31.tgz"; - sha512 = "/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.32.tgz"; + sha512 = "cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg=="; }; }; "@types/webpack-sources-3.2.0" = { @@ -1642,13 +1642,13 @@ let sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; }; }; - "asn1-0.2.4" = { + "asn1-0.2.6" = { name = "asn1"; packageName = "asn1"; - version = "0.2.4"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; - sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz"; + sha512 = "ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ=="; }; }; "asn1.js-5.4.1" = { @@ -2164,13 +2164,13 @@ let sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.17.5" = { + "browserslist-4.18.1" = { name = "browserslist"; packageName = "browserslist"; - version = "4.17.5"; + version = "4.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz"; - sha512 = "I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz"; + sha512 = "8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ=="; }; }; "buffer-4.9.2" = { @@ -2389,13 +2389,13 @@ let sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; - "camelcase-6.2.0" = { + "camelcase-6.2.1" = { name = "camelcase"; packageName = "camelcase"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz"; - sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz"; + sha512 = "tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA=="; }; }; "caniuse-api-3.0.0" = { @@ -2407,13 +2407,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001271" = { + "caniuse-lite-1.0.30001286" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001271"; + version = "1.0.30001286"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz"; - sha512 = "BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz"; + sha512 = "zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -2767,13 +2767,13 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "color-string-1.6.0" = { + "color-string-1.9.0" = { name = "color-string"; packageName = "color-string"; - version = "1.6.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz"; - sha512 = "c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA=="; + url = "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz"; + sha512 = "9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ=="; }; }; "colorette-1.4.0" = { @@ -2875,13 +2875,13 @@ let sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; }; }; - "common-tags-1.8.0" = { + "common-tags-1.8.2" = { name = "common-tags"; packageName = "common-tags"; - version = "1.8.0"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz"; - sha512 = "6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="; + url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz"; + sha512 = "gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA=="; }; }; "commondir-1.0.1" = { @@ -3091,13 +3091,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.18.3" = { + "core-js-compat-3.19.3" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.18.3"; + version = "3.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.18.3.tgz"; - sha512 = "4zP6/y0a2RTHN5bRGT7PTq9lVt3WzvffTNjqnTKsXhkAYNDTkdCLOIfAdOLcQ/7TDdyRj3c+NeHe1NmF1eDScw=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.3.tgz"; + sha512 = "59tYzuWgEEVU9r+SRgceIGXSSUn47JknoiXW6Oq7RW8QHjXWz3/vp8pa7dbtuVu40sewz3OP3JmQEcDdztrLhA=="; }; }; "core-util-is-1.0.2" = { @@ -3442,13 +3442,13 @@ let sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; }; - "debug-4.3.2" = { + "debug-4.3.3" = { name = "debug"; packageName = "debug"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz"; + sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; }; }; "decamelize-1.2.0" = { @@ -3766,13 +3766,13 @@ let sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; }; }; - "domhandler-4.2.2" = { + "domhandler-4.3.0" = { name = "domhandler"; packageName = "domhandler"; - version = "4.2.2"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz"; - sha512 = "PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w=="; + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz"; + sha512 = "fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g=="; }; }; "domutils-1.7.0" = { @@ -3865,13 +3865,13 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.3.878" = { + "electron-to-chromium-1.4.16" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.878"; + version = "1.4.16"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.878.tgz"; - sha512 = "O6yxWCN9ph2AdspAIszBnd9v8s11hQx8ub9w4UGApzmNRnoKhbulOWqbO8THEQec/aEHtvy+donHZMlh6l1rbA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.16.tgz"; + sha512 = "BQb7FgYwnu6haWLU63/CdVW+9xhmHls3RCQUFiV4lvw3wimEHTVcUk2hkuZo76QhR8nnDdfZE7evJIZqijwPdA=="; }; }; "elliptic-6.5.4" = { @@ -3955,13 +3955,13 @@ let sha512 = "sd3nCQMeYMaY84Sz41bVJ30ZvQN1/4ZcD8uYMOuUbM39FDh58NY9/AcImVJ7Z+gjCFdcSU6VscZzhUoPW8jp6Q=="; }; }; - "elm-tooling-1.6.0" = { + "elm-tooling-1.7.0" = { name = "elm-tooling"; packageName = "elm-tooling"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.6.0.tgz"; - sha512 = "quliLTmqEcqqFZEcJKnYcZ9BrL1K2sYvtryQl6BfaMD6HaI8oRaZYDPY/Ihdo7X7t7mY5TbSlrcxv6coJgWwtA=="; + url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.7.0.tgz"; + sha512 = "EHZ54voWrG3BhUONbH/wFw5U95H6N7R4QFgXHDrPIaDBDdeyNkpFu4QWArSWkhzxyCF7hqT8ya2yy7SferDsgg=="; }; }; "elm-webpack-loader-6.0.1" = { @@ -4180,13 +4180,13 @@ let sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; }; - "estraverse-5.2.0" = { + "estraverse-5.3.0" = { name = "estraverse"; packageName = "estraverse"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz"; - sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"; + sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; }; }; "esutils-2.0.3" = { @@ -4720,13 +4720,13 @@ let sha512 = "SDgHBgV+RCjrYs8aUwCb9rTgbTVuSdzvFmLaChsLre1yf+D64khCW++VYciaByZ8Rm0uKF8R/XEpXuTRSGUM1A=="; }; }; - "follow-redirects-1.14.4" = { + "follow-redirects-1.14.6" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.4"; + version = "1.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz"; - sha512 = "zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz"; + sha512 = "fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A=="; }; }; "for-in-1.0.2" = { @@ -4765,13 +4765,13 @@ let sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; }; }; - "fraction.js-4.1.1" = { + "fraction.js-4.1.2" = { name = "fraction.js"; packageName = "fraction.js"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz"; - sha512 = "MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg=="; + url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.2.tgz"; + sha512 = "o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA=="; }; }; "fragment-cache-0.2.1" = { @@ -5521,13 +5521,13 @@ let sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; }; }; - "http-parser-js-0.5.3" = { + "http-parser-js-0.5.5" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.5.3"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz"; - sha512 = "t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg=="; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz"; + sha512 = "x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA=="; }; }; "http-proxy-1.17.0" = { @@ -5656,13 +5656,13 @@ let sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; }; }; - "ignore-5.1.8" = { + "ignore-5.1.9" = { name = "ignore"; packageName = "ignore"; - version = "5.1.8"; + version = "5.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"; - sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz"; + sha512 = "2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ=="; }; }; "immer-1.7.2" = { @@ -6088,6 +6088,15 @@ let sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; }; + "is-git-url-1.0.0" = { + name = "is-git-url"; + packageName = "is-git-url"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-git-url/-/is-git-url-1.0.0.tgz"; + sha1 = "53f684cd143285b52c3244b4e6f28253527af66b"; + }; + }; "is-glob-3.1.0" = { name = "is-glob"; packageName = "is-glob"; @@ -6115,13 +6124,13 @@ let sha512 = "2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="; }; }; - "is-negative-zero-2.0.1" = { + "is-negative-zero-2.0.2" = { name = "is-negative-zero"; packageName = "is-negative-zero"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; - sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="; + url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; + sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; }; }; "is-number-3.0.0" = { @@ -6331,13 +6340,13 @@ let sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; }; - "is-weakref-1.0.1" = { + "is-weakref-1.0.2" = { name = "is-weakref"; packageName = "is-weakref"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz"; - sha512 = "b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ=="; + url = "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz"; + sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; }; }; "is-windows-1.0.2" = { @@ -6502,13 +6511,13 @@ let sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; }; }; - "json-schema-0.2.3" = { + "json-schema-0.4.0" = { name = "json-schema"; packageName = "json-schema"; - version = "0.2.3"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz"; + sha512 = "es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="; }; }; "json-schema-traverse-0.4.1" = { @@ -6610,13 +6619,13 @@ let sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; }; }; - "jsprim-1.4.1" = { + "jsprim-1.4.2" = { name = "jsprim"; packageName = "jsprim"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz"; + sha512 = "P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw=="; }; }; "keyv-3.1.0" = { @@ -6628,13 +6637,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.0.3" = { + "keyv-4.0.4" = { name = "keyv"; packageName = "keyv"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz"; - sha512 = "zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.0.4.tgz"; + sha512 = "vqNHbAc8BBsxk+7QBYLW0Y219rWcClspR6WSeoHYKG5mnsSoOH+BL1pWq02DDCVdvvuUny5rkBlzMRzoqc+GIg=="; }; }; "killable-1.0.1" = { @@ -6700,13 +6709,13 @@ let sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="; }; }; - "klona-2.0.4" = { + "klona-2.0.5" = { name = "klona"; packageName = "klona"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz"; - sha512 = "ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA=="; + url = "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz"; + sha512 = "pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ=="; }; }; "last-call-webpack-plugin-3.0.0" = { @@ -6736,13 +6745,13 @@ let sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; }; }; - "lines-and-columns-1.1.6" = { + "lines-and-columns-1.2.4" = { name = "lines-and-columns"; packageName = "lines-and-columns"; - version = "1.1.6"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; - sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; + sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; }; }; "load-json-file-1.1.0" = { @@ -6781,13 +6790,13 @@ let sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; }; }; - "loader-utils-2.0.0" = { + "loader-utils-2.0.2" = { name = "loader-utils"; packageName = "loader-utils"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz"; - sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz"; + sha512 = "TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A=="; }; }; "locate-path-2.0.0" = { @@ -6889,13 +6898,13 @@ let sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; }; }; - "loglevel-1.7.1" = { + "loglevel-1.8.0" = { name = "loglevel"; packageName = "loglevel"; - version = "1.7.1"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz"; - sha512 = "Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.8.0.tgz"; + sha512 = "G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA=="; }; }; "lower-case-2.0.2" = { @@ -7150,31 +7159,31 @@ let sha512 = "QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw=="; }; }; - "mime-2.5.2" = { + "mime-2.6.0" = { name = "mime"; packageName = "mime"; - version = "2.5.2"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz"; - sha512 = "tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="; + url = "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz"; + sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="; }; }; - "mime-db-1.50.0" = { + "mime-db-1.51.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.50.0"; + version = "1.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz"; - sha512 = "9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"; + sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; }; - "mime-types-2.1.33" = { + "mime-types-2.1.34" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.33"; + version = "2.1.34"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz"; - sha512 = "plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"; + sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; }; }; "mimic-fn-1.2.0" = { @@ -7276,13 +7285,13 @@ let sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; }; }; - "minipass-3.1.5" = { + "minipass-3.1.6" = { name = "minipass"; packageName = "minipass"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz"; - sha512 = "+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz"; + sha512 = "rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ=="; }; }; "minizlib-1.3.3" = { @@ -7753,13 +7762,13 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "object-inspect-1.11.0" = { + "object-inspect-1.11.1" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz"; - sha512 = "jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz"; + sha512 = "If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA=="; }; }; "object-is-1.1.5" = { @@ -8554,13 +8563,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.3.11" = { + "postcss-8.4.4" = { name = "postcss"; packageName = "postcss"; - version = "8.3.11"; + version = "8.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz"; - sha512 = "hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.4.tgz"; + sha512 = "joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q=="; }; }; "postcss-calc-7.0.5" = { @@ -8860,13 +8869,13 @@ let sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; }; }; - "postcss-selector-parser-6.0.6" = { + "postcss-selector-parser-6.0.7" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "6.0.6"; + version = "6.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz"; - sha512 = "9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg=="; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.7.tgz"; + sha512 = "U+b/Deoi4I/UmE6KOVPpnhS7I7AYdKbhGcat+qTQ27gycvaACvNEw11ba6RrkwVmDVRW7sigWgLj4/KbbJjeDA=="; }; }; "postcss-svgo-4.0.3" = { @@ -8896,13 +8905,13 @@ let sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; }; }; - "postcss-value-parser-4.1.0" = { + "postcss-value-parser-4.2.0" = { name = "postcss-value-parser"; packageName = "postcss-value-parser"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; - sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="; + url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"; + sha512 = "1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="; }; }; "prepend-http-1.0.4" = { @@ -10174,13 +10183,22 @@ let sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; }; }; - "signal-exit-3.0.5" = { + "signal-exit-3.0.6" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz"; - sha512 = "KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ=="; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz"; + sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="; + }; + }; + "simple-git-1.132.0" = { + name = "simple-git"; + packageName = "simple-git"; + version = "1.132.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.132.0.tgz"; + sha512 = "xauHm1YqCTom1sC9eOjfq3/9RKiUA9iPnxBbrY2DdL8l4ADMu0jjM5l5lphQP5YWNqAL2aXC/OeuQ76vHtW5fg=="; }; }; "simple-swizzle-0.2.2" = { @@ -10336,13 +10354,13 @@ let sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; }; }; - "source-map-js-0.6.2" = { + "source-map-js-1.0.1" = { name = "source-map-js"; packageName = "source-map-js"; - version = "0.6.2"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz"; - sha512 = "/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug=="; + url = "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz"; + sha512 = "4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA=="; }; }; "source-map-resolve-0.5.3" = { @@ -10354,13 +10372,13 @@ let sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; }; - "source-map-support-0.5.20" = { + "source-map-support-0.5.21" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.20"; + version = "0.5.21"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz"; - sha512 = "n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw=="; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"; + sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; }; }; "source-map-url-0.4.1" = { @@ -10399,13 +10417,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.10" = { + "spdx-license-ids-3.0.11" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.10"; + version = "3.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz"; - sha512 = "oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"; + sha512 = "Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g=="; }; }; "spdy-4.0.2" = { @@ -12145,13 +12163,13 @@ let sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A=="; }; }; - "ws-7.5.5" = { + "ws-7.5.6" = { name = "ws"; packageName = "ws"; - version = "7.5.5"; + version = "7.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz"; - sha512 = "BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz"; + sha512 = "6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA=="; }; }; "xmlbuilder-13.0.2" = { @@ -12313,7 +12331,7 @@ in sources."accepts-1.3.7" sources."ajv-6.12.6" sources."array-flatten-1.1.1" - sources."asn1-0.2.4" + sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" @@ -12395,18 +12413,18 @@ in sources."isarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."lodash-4.17.21" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimist-1.2.0" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -12501,7 +12519,7 @@ in sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" - sources."asn1-0.2.4" + sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."astral-regex-1.0.0" sources."asynckit-0.4.0" @@ -12614,11 +12632,11 @@ in sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."locate-path-5.0.0" sources."lodash-4.17.21" (sources."lru-cache-4.1.5" // { @@ -12626,11 +12644,11 @@ in sources."yallist-2.1.2" ]; }) - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-3.1.5" + sources."minipass-3.1.6" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."moment-2.29.1" @@ -12839,8 +12857,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -12902,7 +12920,7 @@ in sources."vary-1.1.2" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-7.5.5" + sources."ws-7.5.6" ]; buildInputs = globalBuildInputs; meta = { @@ -12944,7 +12962,7 @@ in sources."glob-parent-5.1.2" sources."globby-11.0.4" sources."human-signals-2.1.0" - sources."ignore-5.1.8" + sources."ignore-5.1.9" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -12969,7 +12987,7 @@ in sources."run-parallel-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.5" + sources."signal-exit-3.0.6" sources."slash-3.0.0" sources."strip-final-newline-2.0.0" sources."to-regex-range-5.0.1" @@ -13037,7 +13055,7 @@ in }) sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."follow-redirects-1.14.4" + sources."follow-redirects-1.14.6" sources."fresh-0.5.2" sources."fsevents-2.3.2" sources."get-stream-4.1.0" @@ -13089,7 +13107,7 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.5" + sources."signal-exit-3.0.6" sources."statuses-1.5.0" sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" @@ -13134,7 +13152,7 @@ in sources."commander-7.2.0" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."elm-tooling-1.6.0" + sources."elm-tooling-1.7.0" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -13191,7 +13209,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-16.11.4" + sources."@types/node-16.11.12" sources."@types/responselike-1.0.0" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.2" @@ -13220,7 +13238,7 @@ in sources."isurl-1.0.0" sources."json-buffer-3.0.1" sources."jsonfile-4.0.0" - sources."keyv-4.0.3" + sources."keyv-4.0.4" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."mimic-response-2.1.0" @@ -13271,7 +13289,7 @@ in sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" - sources."asn1-0.2.4" + sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" @@ -13355,15 +13373,15 @@ in sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."locate-path-3.0.0" sources."lodash-4.17.15" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-2.9.0" @@ -13507,52 +13525,52 @@ in }; dependencies = [ sources."@babel/cli-7.12.10" - sources."@babel/code-frame-7.15.8" - sources."@babel/compat-data-7.15.0" + sources."@babel/code-frame-7.16.0" + sources."@babel/compat-data-7.16.4" sources."@babel/core-7.12.10" - sources."@babel/generator-7.15.8" - sources."@babel/helper-annotate-as-pure-7.15.4" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" - (sources."@babel/helper-compilation-targets-7.15.4" // { + sources."@babel/generator-7.16.0" + sources."@babel/helper-annotate-as-pure-7.16.0" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.0" + (sources."@babel/helper-compilation-targets-7.16.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.15.4" - sources."@babel/helper-create-regexp-features-plugin-7.14.5" - sources."@babel/helper-explode-assignable-expression-7.15.4" - sources."@babel/helper-function-name-7.15.4" - sources."@babel/helper-get-function-arity-7.15.4" - sources."@babel/helper-hoist-variables-7.15.4" - sources."@babel/helper-member-expression-to-functions-7.15.4" - sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.8" - sources."@babel/helper-optimise-call-expression-7.15.4" + sources."@babel/helper-create-class-features-plugin-7.16.0" + sources."@babel/helper-create-regexp-features-plugin-7.16.0" + sources."@babel/helper-explode-assignable-expression-7.16.0" + sources."@babel/helper-function-name-7.16.0" + sources."@babel/helper-get-function-arity-7.16.0" + sources."@babel/helper-hoist-variables-7.16.0" + sources."@babel/helper-member-expression-to-functions-7.16.0" + sources."@babel/helper-module-imports-7.16.0" + sources."@babel/helper-module-transforms-7.16.0" + sources."@babel/helper-optimise-call-expression-7.16.0" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-remap-async-to-generator-7.15.4" - sources."@babel/helper-replace-supers-7.15.4" - sources."@babel/helper-simple-access-7.15.4" - sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" - sources."@babel/helper-split-export-declaration-7.15.4" + sources."@babel/helper-remap-async-to-generator-7.16.4" + sources."@babel/helper-replace-supers-7.16.0" + sources."@babel/helper-simple-access-7.16.0" + sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" + sources."@babel/helper-split-export-declaration-7.16.0" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.15.4" - sources."@babel/helpers-7.15.4" - sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.8" - sources."@babel/plugin-proposal-async-generator-functions-7.15.8" - sources."@babel/plugin-proposal-class-properties-7.14.5" - sources."@babel/plugin-proposal-dynamic-import-7.14.5" - sources."@babel/plugin-proposal-export-namespace-from-7.14.5" - sources."@babel/plugin-proposal-json-strings-7.14.5" - sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" - sources."@babel/plugin-proposal-numeric-separator-7.14.5" - sources."@babel/plugin-proposal-object-rest-spread-7.15.6" - sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" - sources."@babel/plugin-proposal-optional-chaining-7.14.5" - sources."@babel/plugin-proposal-private-methods-7.14.5" - sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" + sources."@babel/helper-wrap-function-7.16.0" + sources."@babel/helpers-7.16.3" + sources."@babel/highlight-7.16.0" + sources."@babel/parser-7.16.4" + sources."@babel/plugin-proposal-async-generator-functions-7.16.4" + sources."@babel/plugin-proposal-class-properties-7.16.0" + sources."@babel/plugin-proposal-dynamic-import-7.16.0" + sources."@babel/plugin-proposal-export-namespace-from-7.16.0" + sources."@babel/plugin-proposal-json-strings-7.16.0" + sources."@babel/plugin-proposal-logical-assignment-operators-7.16.0" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.0" + sources."@babel/plugin-proposal-numeric-separator-7.16.0" + sources."@babel/plugin-proposal-object-rest-spread-7.16.0" + sources."@babel/plugin-proposal-optional-catch-binding-7.16.0" + sources."@babel/plugin-proposal-optional-chaining-7.16.0" + sources."@babel/plugin-proposal-private-methods-7.16.0" + sources."@babel/plugin-proposal-unicode-property-regex-7.16.0" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" @@ -13565,45 +13583,45 @@ in sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.14.5" - sources."@babel/plugin-transform-async-to-generator-7.14.5" - sources."@babel/plugin-transform-block-scoped-functions-7.14.5" - sources."@babel/plugin-transform-block-scoping-7.15.3" - sources."@babel/plugin-transform-classes-7.15.4" - sources."@babel/plugin-transform-computed-properties-7.14.5" - sources."@babel/plugin-transform-destructuring-7.14.7" - sources."@babel/plugin-transform-dotall-regex-7.14.5" - sources."@babel/plugin-transform-duplicate-keys-7.14.5" - sources."@babel/plugin-transform-exponentiation-operator-7.14.5" - sources."@babel/plugin-transform-for-of-7.15.4" - sources."@babel/plugin-transform-function-name-7.14.5" - sources."@babel/plugin-transform-literals-7.14.5" - sources."@babel/plugin-transform-member-expression-literals-7.14.5" - sources."@babel/plugin-transform-modules-amd-7.14.5" - sources."@babel/plugin-transform-modules-commonjs-7.15.4" - sources."@babel/plugin-transform-modules-systemjs-7.15.4" - sources."@babel/plugin-transform-modules-umd-7.14.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" - sources."@babel/plugin-transform-new-target-7.14.5" - sources."@babel/plugin-transform-object-super-7.14.5" - sources."@babel/plugin-transform-parameters-7.15.4" - sources."@babel/plugin-transform-property-literals-7.14.5" - sources."@babel/plugin-transform-regenerator-7.14.5" - sources."@babel/plugin-transform-reserved-words-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.16.0" + sources."@babel/plugin-transform-async-to-generator-7.16.0" + sources."@babel/plugin-transform-block-scoped-functions-7.16.0" + sources."@babel/plugin-transform-block-scoping-7.16.0" + sources."@babel/plugin-transform-classes-7.16.0" + sources."@babel/plugin-transform-computed-properties-7.16.0" + sources."@babel/plugin-transform-destructuring-7.16.0" + sources."@babel/plugin-transform-dotall-regex-7.16.0" + sources."@babel/plugin-transform-duplicate-keys-7.16.0" + sources."@babel/plugin-transform-exponentiation-operator-7.16.0" + sources."@babel/plugin-transform-for-of-7.16.0" + sources."@babel/plugin-transform-function-name-7.16.0" + sources."@babel/plugin-transform-literals-7.16.0" + sources."@babel/plugin-transform-member-expression-literals-7.16.0" + sources."@babel/plugin-transform-modules-amd-7.16.0" + sources."@babel/plugin-transform-modules-commonjs-7.16.0" + sources."@babel/plugin-transform-modules-systemjs-7.16.0" + sources."@babel/plugin-transform-modules-umd-7.16.0" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.0" + sources."@babel/plugin-transform-new-target-7.16.0" + sources."@babel/plugin-transform-object-super-7.16.0" + sources."@babel/plugin-transform-parameters-7.16.3" + sources."@babel/plugin-transform-property-literals-7.16.0" + sources."@babel/plugin-transform-regenerator-7.16.0" + sources."@babel/plugin-transform-reserved-words-7.16.0" sources."@babel/plugin-transform-runtime-7.12.10" - sources."@babel/plugin-transform-shorthand-properties-7.14.5" - sources."@babel/plugin-transform-spread-7.15.8" - sources."@babel/plugin-transform-sticky-regex-7.14.5" - sources."@babel/plugin-transform-template-literals-7.14.5" - sources."@babel/plugin-transform-typeof-symbol-7.14.5" - sources."@babel/plugin-transform-unicode-escapes-7.14.5" - sources."@babel/plugin-transform-unicode-regex-7.14.5" + sources."@babel/plugin-transform-shorthand-properties-7.16.0" + sources."@babel/plugin-transform-spread-7.16.0" + sources."@babel/plugin-transform-sticky-regex-7.16.0" + sources."@babel/plugin-transform-template-literals-7.16.0" + sources."@babel/plugin-transform-typeof-symbol-7.16.0" + sources."@babel/plugin-transform-unicode-escapes-7.16.0" + sources."@babel/plugin-transform-unicode-regex-7.16.0" sources."@babel/preset-env-7.12.10" sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.12.5" - sources."@babel/template-7.15.4" - sources."@babel/traverse-7.15.4" - sources."@babel/types-7.15.6" + sources."@babel/template-7.16.0" + sources."@babel/traverse-7.16.3" + sources."@babel/types-7.16.0" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -13616,7 +13634,7 @@ in sources."@types/http-proxy-1.17.7" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-16.11.4" + sources."@types/node-16.11.12" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@types/source-list-map-0.1.2" @@ -13626,7 +13644,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.31" // { + (sources."@types/webpack-4.41.32" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -13682,7 +13700,7 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."asap-2.0.6" - sources."asn1-0.2.4" + sources."asn1-0.2.6" (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.12.0" @@ -13767,7 +13785,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.17.5" + sources."browserslist-4.18.1" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" @@ -13784,7 +13802,7 @@ in sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001271" + sources."caniuse-lite-1.0.30001286" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -13840,12 +13858,12 @@ in sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.6.0" + sources."color-string-1.9.0" sources."colorette-1.4.0" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commander-4.1.1" - sources."common-tags-1.8.0" + sources."common-tags-1.8.2" sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."compressible-2.0.18" @@ -13879,7 +13897,7 @@ in ]; }) sources."core-js-2.6.12" - (sources."core-js-compat-3.18.3" // { + (sources."core-js-compat-3.19.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -13899,8 +13917,8 @@ in sources."css-declaration-sorter-4.0.1" (sources."css-loader-4.3.0" // { dependencies = [ - sources."camelcase-6.2.0" - sources."loader-utils-2.0.0" + sources."camelcase-6.2.1" + sources."loader-utils-2.0.2" sources."lru-cache-6.0.0" sources."semver-7.3.5" sources."yallist-4.0.0" @@ -13931,7 +13949,7 @@ in sources."cycle-1.0.3" sources."cyclist-1.0.1" sources."dashdash-1.14.1" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."deep-equal-0.2.2" @@ -13971,7 +13989,7 @@ in sources."dom-serializer-1.3.2" sources."domain-browser-1.2.0" sources."domelementtype-2.2.0" - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" sources."domutils-2.8.0" sources."dot-case-3.0.4" sources."dot-prop-5.3.0" @@ -13980,7 +13998,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.878" + sources."electron-to-chromium-1.4.16" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -14002,7 +14020,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."elm-tooling-1.6.0" + sources."elm-tooling-1.7.0" sources."elm-webpack-loader-6.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -14025,7 +14043,7 @@ in sources."esprima-4.0.1" (sources."esrecurse-4.3.0" // { dependencies = [ - sources."estraverse-5.2.0" + sources."estraverse-5.3.0" ]; }) sources."estraverse-4.3.0" @@ -14120,7 +14138,7 @@ in }) (sources."file-loader-6.2.0" // { dependencies = [ - sources."loader-utils-2.0.0" + sources."loader-utils-2.0.2" sources."schema-utils-3.1.1" ]; }) @@ -14143,12 +14161,12 @@ in sources."find-up-4.1.0" sources."firstline-1.3.1" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.14.4" + sources."follow-redirects-1.14.6" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.2.0" - sources."fraction.js-4.1.1" + sources."fraction.js-4.1.2" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from2-2.3.0" @@ -14236,7 +14254,7 @@ in sources."inherits-2.0.3" ]; }) - sources."http-parser-js-0.5.3" + sources."http-parser-js-0.5.5" sources."http-proxy-1.18.1" sources."http-proxy-middleware-0.21.0" sources."http-signature-1.2.0" @@ -14298,7 +14316,7 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" - sources."is-negative-zero-2.0.1" + sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" sources."is-number-object-1.0.6" sources."is-obj-2.0.0" @@ -14317,7 +14335,7 @@ in sources."is-symbol-1.0.4" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" - sources."is-weakref-1.0.1" + sources."is-weakref-1.0.2" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" @@ -14330,7 +14348,7 @@ in sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" @@ -14338,13 +14356,13 @@ in sources."json5-2.2.0" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."killable-1.0.1" sources."kind-of-6.0.3" - sources."klona-2.0.4" + sources."klona-2.0.5" sources."last-call-webpack-plugin-3.0.0" sources."lcid-1.0.0" - sources."lines-and-columns-1.1.6" + sources."lines-and-columns-1.2.4" (sources."load-json-file-1.1.0" // { dependencies = [ sources."parse-json-2.2.0" @@ -14364,7 +14382,7 @@ in sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" sources."lodash.uniq-4.5.0" - sources."loglevel-1.7.1" + sources."loglevel-1.8.0" sources."lower-case-2.0.2" sources."lru-cache-5.1.1" sources."make-dir-2.1.0" @@ -14384,8 +14402,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-1.2.0" (sources."mini-css-extract-plugin-0.12.0" // { dependencies = [ @@ -14458,7 +14476,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.11.0" + sources."object-inspect-1.11.1" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -14564,7 +14582,7 @@ in dependencies = [ sources."cosmiconfig-7.0.1" sources."import-fresh-3.3.0" - sources."loader-utils-2.0.0" + sources."loader-utils-2.0.2" sources."lru-cache-6.0.0" sources."parse-json-5.2.0" sources."path-type-4.0.0" @@ -14663,17 +14681,17 @@ in }) (sources."postcss-safe-parser-5.0.2" // { dependencies = [ - sources."postcss-8.3.11" + sources."postcss-8.4.4" ]; }) - sources."postcss-selector-parser-6.0.6" + sources."postcss-selector-parser-6.0.7" (sources."postcss-svgo-4.0.3" // { dependencies = [ sources."postcss-value-parser-3.3.1" ]; }) sources."postcss-unique-selectors-4.0.1" - sources."postcss-value-parser-4.1.0" + sources."postcss-value-parser-4.2.0" sources."prepend-http-1.0.4" sources."pretty-bytes-5.6.0" sources."pretty-error-2.1.2" @@ -14849,7 +14867,7 @@ in sources."shebang-regex-3.0.0" sources."shell-quote-1.6.1" sources."side-channel-1.0.4" - sources."signal-exit-3.0.5" + sources."signal-exit-3.0.6" (sources."simple-swizzle-0.2.2" // { dependencies = [ sources."is-arrayish-0.3.2" @@ -14901,9 +14919,9 @@ in sources."sort-keys-1.1.2" sources."source-list-map-2.0.1" sources."source-map-0.5.7" - sources."source-map-js-0.6.2" + sources."source-map-js-1.0.1" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.20" // { + (sources."source-map-support-0.5.21" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -14912,7 +14930,7 @@ in sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.10" + sources."spdx-license-ids-3.0.11" sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -14969,7 +14987,7 @@ in sources."strip-eof-1.0.0" (sources."style-loader-1.3.0" // { dependencies = [ - sources."loader-utils-2.0.0" + sources."loader-utils-2.0.2" ]; }) (sources."stylehacks-4.0.3" // { @@ -15102,7 +15120,7 @@ in }) (sources."url-loader-4.1.1" // { dependencies = [ - sources."loader-utils-2.0.0" + sources."loader-utils-2.0.2" sources."schema-utils-3.1.1" ]; }) @@ -15162,7 +15180,7 @@ in }) (sources."webpack-dev-middleware-3.7.3" // { dependencies = [ - sources."mime-2.5.2" + sources."mime-2.6.0" ]; }) (sources."webpack-dev-server-3.11.0" // { @@ -15365,10 +15383,10 @@ in elm-review = nodeEnv.buildNodePackage { name = "elm-review"; packageName = "elm-review"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-review/-/elm-review-2.6.1.tgz"; - sha512 = "sWkHt1DMXkRyPqhMAIym4+5OVJHUmexvrYY5cdVkKr9Qdw+6ND1wH6V1ACu4vge3YdonG7UC+6gCYeHkgI760g=="; + url = "https://registry.npmjs.org/elm-review/-/elm-review-2.7.0.tgz"; + sha512 = "PvZj6M6rHYpyAGp2MKF/TzeDawioQacBTkVxzlBBGuMoO4LXw2PMIm/NmhkxcD38l5SvDIwpWmyDKvEsMaWNhQ=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -15376,7 +15394,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-16.11.4" + sources."@types/node-16.11.12" sources."@types/responselike-1.0.0" (sources."ansi-escapes-4.3.2" // { dependencies = [ @@ -15410,12 +15428,12 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.3.2" + sources."debug-4.3.3" sources."decompress-response-5.0.0" sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" sources."duplexer3-0.1.4" - sources."elm-tooling-1.6.0" + sources."elm-tooling-1.7.0" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."fast-levenshtein-3.0.0" @@ -15446,7 +15464,7 @@ in sources."isexe-2.0.0" sources."json-buffer-3.0.1" sources."jsonfile-6.1.0" - sources."keyv-4.0.3" + sources."keyv-4.0.4" sources."kleur-3.0.3" sources."locate-path-5.0.0" sources."log-symbols-4.1.0" @@ -15483,7 +15501,7 @@ in sources."safe-buffer-5.2.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.5" + sources."signal-exit-3.0.6" sources."sisteransi-1.0.5" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -15512,4 +15530,30 @@ in bypassCache = true; reconstructLock = true; }; + elm-git-install = nodeEnv.buildNodePackage { + name = "elm-git-install"; + packageName = "elm-git-install"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-git-install/-/elm-git-install-0.1.3.tgz"; + sha512 = "TdMhhgnj15UtbVAIfGo71zoUYKlZRJISriDJLNH/jx1xbvYLAF/x5hbOUG2gFlWypLurUiEPvzpAZzIYdI0N9Q=="; + }; + dependencies = [ + sources."debug-4.3.3" + sources."is-git-url-1.0.0" + sources."ms-2.1.2" + sources."semver-5.7.1" + sources."simple-git-1.132.0" + sources."upath-1.2.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A tool for installing private Elm packages from any git url."; + homepage = "https://github.com/Skinney/elm-git-install#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; } From 005aa1807cc2fb575ce42edac3884b1728e93110 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 18:33:51 +0000 Subject: [PATCH 078/104] python38Packages.lupupy: 0.0.22 -> 0.0.24 --- pkgs/development/python-modules/lupupy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lupupy/default.nix b/pkgs/development/python-modules/lupupy/default.nix index ed045a16cfc3..07628c027409 100644 --- a/pkgs/development/python-modules/lupupy/default.nix +++ b/pkgs/development/python-modules/lupupy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "lupupy"; - version = "0.0.22"; + version = "0.0.24"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3yxhuG5aYC6Vx04pJtKxpUKevvw9hyZ9zVi6XmLRIv8="; + sha256 = "62b63877aa6a9e6bfecd163a922641906f233cc4b53b1314ee71247e157273c6"; }; propagatedBuildInputs = [ From 38da06c69f821af50323d54b28d342cc3eb42891 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 12 Dec 2021 13:57:27 -0500 Subject: [PATCH 079/104] arrow-cpp: fix sandboxed build on darwin --- pkgs/development/libraries/arrow-cpp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 55efb99b8bd0..5138a9654522 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -199,6 +199,7 @@ stdenv.mkDerivation rec { "S3RegionResolutionTest.PublicBucket" "S3RegionResolutionTest.RestrictedBucket" "TestMinioServer.Connect" + "TestS3FS.GetFileInfoRoot" "TestS3FS.OpenOutputStreamBackgroundWrites" "TestS3FS.OpenOutputStreamDestructorBackgroundWrites" "TestS3FS.OpenOutputStreamDestructorSyncWrite" From 6d7970362f9d73ae5f477ba3c6e7f5a4873d87e6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Dec 2021 19:56:15 +0100 Subject: [PATCH 080/104] python3Packages.aioambient: 2021.10.1 -> 2021.12.0 --- pkgs/development/python-modules/aioambient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioambient/default.nix b/pkgs/development/python-modules/aioambient/default.nix index b71574971fc8..2396b24f6d9f 100644 --- a/pkgs/development/python-modules/aioambient/default.nix +++ b/pkgs/development/python-modules/aioambient/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioambient"; - version = "2021.10.1"; + version = "2021.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-DCh/o7p+lO5BhN3JoLdhImkzfxoyqiscA/6CwwvAnc0="; + sha256 = "sha256-nFCLMpkuSVPecKrtJ/z7KuyGw4Z9X79wKXmWsewbxvY="; }; postPatch = '' From 632c8b42c45bb6f8ab87d2db5672c23abd018d4c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Dec 2021 19:57:40 +0100 Subject: [PATCH 081/104] python3Packages.aioymaps: 1.2.1 -> 1.2.2 --- pkgs/development/python-modules/aioymaps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioymaps/default.nix b/pkgs/development/python-modules/aioymaps/default.nix index 69aef58a1b8f..c23451b9db92 100644 --- a/pkgs/development/python-modules/aioymaps/default.nix +++ b/pkgs/development/python-modules/aioymaps/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "aioymaps"; - version = "1.2.1"; + version = "1.2.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8U8I2pqvvm87IW1hhR4CGyIWdM/jsRPRP6u2yYGXdBw="; + sha256 = "sha256-ZWolVsh6MSEA3h62ERaCLSVAr+vl53yysPjulMtW4QI="; }; propagatedBuildInputs = [ From ecc5da7743983b7fbb41d8cee0c9c99823940f11 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Dec 2021 20:01:26 +0100 Subject: [PATCH 082/104] python3Packages.buienradar: 1.0.4 -> 1.05 --- pkgs/development/python-modules/buienradar/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/buienradar/default.nix b/pkgs/development/python-modules/buienradar/default.nix index a366e0cdd3bc..ba288f59b28a 100644 --- a/pkgs/development/python-modules/buienradar/default.nix +++ b/pkgs/development/python-modules/buienradar/default.nix @@ -13,15 +13,16 @@ buildPythonPackage rec { pname = "buienradar"; - version = "1.0.4"; + version = "1.0.5"; disabled = pythonOlder "3.4"; src = fetchFromGitHub { owner = "mjj4791"; repo = "python-buienradar"; - rev = version; - sha256 = "1s0m5x7wdvzzsm797lh6531k614ybh7z0cikxjxqw377mivpz4wq"; + # https://github.com/mjj4791/python-buienradar/issues/14 + rev = "caa66ea855dbcc7cf6ee13291d9b2ed7ac01ef98"; + hash = "sha256:0xz03xj5qjayriaah20adh0ycvlvb8jdvgh7w5gm236n64g6krj0"; }; propagatedBuildInputs = [ From 41b6fc7176526eaaf85189c2e1c85831a2a90f79 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Dec 2021 20:01:48 +0100 Subject: [PATCH 083/104] python3Packages.google-nest-sdm: 0.4.0 -> 0.4.5 --- pkgs/development/python-modules/google-nest-sdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index befc07ca37df..fc0bab0518a9 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "0.4.0"; + version = "0.4.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = version; - sha256 = "sha256-mm1FhR10asxJI8MQfQipqmQbHQfO3z49jpnnrz38Clo="; + sha256 = "sha256-R1/PkWyMHrZmLp+6VqAkLVzycdT1uK5SySUqpOolJCY="; }; propagatedBuildInputs = [ From 68aa7a8081899bfc461a26b3d9ca1a29a5cedfcd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Dec 2021 20:03:37 +0100 Subject: [PATCH 084/104] python3Packages.hatasmota: 0.3.0 -> 0.3.1 --- pkgs/development/python-modules/hatasmota/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index 6bb6e460f554..6a0a3793d87b 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "sha256-KPFnlw6rk+jDKs8Ss/34lIt0MsAQGernCyyF1ImRylA="; + sha256 = "sha256-/am6cRhAdiqMq0u7Ed4qhIA+Em2O0gIt7HfP19+2XHw="; }; propagatedBuildInputs = [ From 875e6c15b8401ffadd5baffe2f00831a6e9da459 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Dec 2021 20:04:12 +0100 Subject: [PATCH 085/104] python3Packages.py17track: 3.3.0 -> 2021.12.2 --- pkgs/development/python-modules/py17track/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py17track/default.nix b/pkgs/development/python-modules/py17track/default.nix index 89090258bd01..b39d50dbfc7a 100644 --- a/pkgs/development/python-modules/py17track/default.nix +++ b/pkgs/development/python-modules/py17track/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "py17track"; - version = "3.3.0"; + version = "2021.12.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "1rnq9ybzj2l3699mjyplc29mxla8fayh52x52cnsz21ixlfd9fky"; + sha256 = "sha256-T0Jjdu6QC8rTqZwe4cdsBbs0hQXUY6CkrImCgYwWL9o="; }; nativeBuildInputs = [ From 62b6d864d207d7b3192a37457672dc9d5292cfee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Dec 2021 20:04:33 +0100 Subject: [PATCH 086/104] python3Packages.pydexcom: 0.2.0 -> 0.2.1 --- pkgs/development/python-modules/pydexcom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydexcom/default.nix b/pkgs/development/python-modules/pydexcom/default.nix index f83d3cbf1102..3f6983d7fd9b 100644 --- a/pkgs/development/python-modules/pydexcom/default.nix +++ b/pkgs/development/python-modules/pydexcom/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pydexcom"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "gagebenne"; repo = pname; rev = version; - sha256 = "19h7r0qbsqd6k6g4nz6z3k9kdmk0sx5zpsrgxwnhsff5fqi0y2ls"; + sha256 = "sha256-fC8K2NHCFcqzmsH02XPAGZtUTTXWyr0p4524UVv6yU4="; }; propagatedBuildInputs = [ requests ]; From 897c0c6ec032de94b0631fd00c31bc0f9de51ff2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Dec 2021 20:07:48 +0100 Subject: [PATCH 087/104] python3Packages.pyefergy: 0.1.4 -> 0.1.5 --- pkgs/development/python-modules/pyefergy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyefergy/default.nix b/pkgs/development/python-modules/pyefergy/default.nix index 9906be5154f4..20f3fb9f417b 100644 --- a/pkgs/development/python-modules/pyefergy/default.nix +++ b/pkgs/development/python-modules/pyefergy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyefergy"; - version = "0.1.4"; + version = "0.1.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = version; - sha256 = "sha256-X/dWEBg3WG6SmMore5otLL4iIueGUS5KgjCPYoMSNd0="; + sha256 = "sha256-8xcKgsZ6buaQdrKD8Qn7jB5IlQ0NkR0nZGuFk+Dd8Q8="; }; propagatedBuildInputs = [ From b11d09f79352c8c1b27131461668e09a3c8d60ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Dec 2021 20:31:49 +0100 Subject: [PATCH 088/104] python3Packages.simplisafe-python: 2021.11.2 -> 2021.12.1 --- pkgs/development/python-modules/simplisafe-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 27c68dcab3e6..bd9c06cf119d 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2021.11.2"; + version = "2021.12.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-5X2qvrACV9OTVYSZYxFncFOgrgywKvVDbC6IVFnJBtw="; + sha256 = "sha256-HWOQAcjsW7iE/AuqOQvdZkubpg53AktReNJxbxHdMFs="; }; nativeBuildInputs = [ From a7760fb114cadc27299adce9c7f9b04e76e304ed Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Dec 2021 20:40:35 +0100 Subject: [PATCH 089/104] python3Packages.twentemilieu: 0.3.0 -> 0.5.0 --- .../python-modules/twentemilieu/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/twentemilieu/default.nix b/pkgs/development/python-modules/twentemilieu/default.nix index fb5617321747..f326a56d8d67 100644 --- a/pkgs/development/python-modules/twentemilieu/default.nix +++ b/pkgs/development/python-modules/twentemilieu/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, poetry-core , aiohttp , yarl , aresponses @@ -11,16 +12,27 @@ buildPythonPackage rec { pname = "twentemilieu"; - version = "0.3.0"; - disabled = pythonOlder "3.7"; + version = "0.5.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "frenck"; repo = "python-twentemilieu"; rev = "v${version}"; - sha256 = "1ff35sh73m2s7fh4d8p2pjwdbfljswr8b8lpcjybz8nsh0286xph"; + sha256 = "sha256-7HQ0+h8oiyY+TacQdX84K0r994rH0AMZAvZz8PUvQl0="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp yarl From 957538cd9dd163c068b984bb15704daaf8217290 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Dec 2021 20:44:54 +0100 Subject: [PATCH 090/104] python3Packages.wled: 0.8.0 -> 0.10.2 --- pkgs/development/python-modules/wled/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index cb6ec2b606d5..4b1104dc4127 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -3,9 +3,10 @@ , pythonOlder , fetchFromGitHub , aiohttp +, awesomeversion , backoff +, cachetools , poetry-core -, packaging , yarl , aresponses , pytest-asyncio @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.8.0"; + version = "0.10.2"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "v${version}"; - sha256 = "1jhykilb81sp1srxk91222qglwdlr993ssvgfnl837nbcx6ws1hw"; + sha256 = "sha256-tqR/edkBFseldSXGoekfRmw//h6Z/Xcg1W0HXJvLhtk="; }; nativeBuildInputs = [ @@ -31,8 +32,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + awesomeversion backoff - packaging + cachetools yarl ]; From f21a477c7b380f113200ce5ceaebc3e8dfe727e7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Dec 2021 20:46:02 +0100 Subject: [PATCH 091/104] python3Packages.zigpy: 0.41.0 -> 0.42.0 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index e5f590b14323..01751219d400 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.41.0"; + version = "0.42.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "sha256-6B5JquShUhW2EudkhCD1s5eJLJU1q1HmX7C/avoI7vU="; + sha256 = "sha256-kSUFcN3QOZWFBgDrOopkYuUyBE9asO6MXf0H9CMjFlc="; }; propagatedBuildInputs = [ From c9e0271369f228d66f574997e77bfd13910e229e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Dec 2021 20:46:33 +0100 Subject: [PATCH 092/104] python3Packages.zha-quirks: 0.0.63 -> 0.0.65 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index b7b07d23a5c5..c1d4328106ae 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.63"; + version = "0.0.65"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "sha256-jAd/qT+uwylE/AOHFnkKWECHnxFFqgCtCp36mrqFZIE="; + sha256 = "sha256-3Lcmc95KotFMlL44zDugIQkHtplMMlyWjSb+SLehaqs="; }; propagatedBuildInputs = [ From fd19df269d61b897dc42cbbe9495cfa1bdd6fe09 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Dec 2021 20:59:08 +0100 Subject: [PATCH 093/104] home-assistant: 2021.11.4 -> 2021.12.0 --- .../home-assistant/component-packages.nix | 22 ++- pkgs/servers/home-assistant/default.nix | 161 ++++++++++++++---- pkgs/servers/home-assistant/frontend.nix | 4 +- .../home-assistant/patches/ffmpeg-path.patch | 84 +++++++++ ...sts-ignore-OSErrors-in-hass-fixture.patch} | 0 .../patches/tests-mock-source-ip.patch | 13 ++ pkgs/servers/home-assistant/update.sh | 2 +- 7 files changed, 246 insertions(+), 40 deletions(-) create mode 100644 pkgs/servers/home-assistant/patches/ffmpeg-path.patch rename pkgs/servers/home-assistant/{0001-tests-ignore-OSErrors-in-hass-fixture.patch => patches/tests-ignore-OSErrors-in-hass-fixture.patch} (100%) create mode 100644 pkgs/servers/home-assistant/patches/tests-mock-source-ip.patch diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 5fccf5816d8c..e76db52e982e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.11.5"; + version = "2021.12.0"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -77,6 +77,7 @@ "azure_event_hub" = ps: with ps; [ azure-eventhub ]; "azure_service_bus" = ps: with ps; [ azure-servicebus ]; "baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip + "balboa" = ps: with ps; [ pybalboa ]; "bayesian" = ps: with ps; [ ]; "bbb_gpio" = ps: with ps; [ ]; # missing inputs: Adafruit_BBIO "bbox" = ps: with ps; [ ]; # missing inputs: pybbox @@ -112,6 +113,7 @@ "bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist "bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist "buienradar" = ps: with ps; [ buienradar ]; + "button" = ps: with ps; [ ]; "caldav" = ps: with ps; [ caldav ]; "calendar" = ps: with ps; [ aiohttp-cors ]; "camera" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; @@ -166,7 +168,7 @@ "default_config" = ps: with ps; [ pynacl pyturbojpeg aiodiscover aiohttp-cors async-upnp-client emoji hass-nabucasa home-assistant-frontend ifaddr pillow pyserial pyudev scapy sqlalchemy zeroconf ]; "delijn" = ps: with ps; [ pydelijn ]; "deluge" = ps: with ps; [ deluge-client ]; - "demo" = ps: with ps; [ aiohttp-cors ]; + "demo" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "denon" = ps: with ps; [ ]; "denonavr" = ps: with ps; [ denonavr ]; "derivative" = ps: with ps; [ ]; @@ -175,6 +177,7 @@ "device_sun_light_trigger" = ps: with ps; [ aiohttp-cors pillow ]; "device_tracker" = ps: with ps; [ ]; "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api ifaddr zeroconf ]; + "devolo_home_network" = ps: with ps; [ devolo-plc-api ]; "dexcom" = ps: with ps; [ pydexcom ]; "dhcp" = ps: with ps; [ aiodiscover scapy ]; "dht" = ps: with ps; [ ]; # missing inputs: adafruit-circuitpython-dht @@ -204,7 +207,6 @@ "dwd_weather_warnings" = ps: with ps; [ dwdwfsapi ]; "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices - "dyson" = ps: with ps; [ aiohttp-cors ifaddr libpurecool zeroconf ]; "eafm" = ps: with ps; [ aioeafm ]; "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy @@ -246,6 +248,7 @@ "etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api "eufy" = ps: with ps; [ ]; # missing inputs: lakeside "everlights" = ps: with ps; [ pyeverlights ]; + "evil_genius_labs" = ps: with ps; [ pyevilgenius ]; "evohome" = ps: with ps; [ evohome-async ]; "ezviz" = ps: with ps; [ ha-ffmpeg pyezviz ]; "faa_delays" = ps: with ps; [ faadelays ]; @@ -411,7 +414,6 @@ "intent_script" = ps: with ps; [ ]; "intesishome" = ps: with ps; [ pyintesishome ]; "ios" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ]; - "iota" = ps: with ps; [ ]; # missing inputs: pyota "iotawatt" = ps: with ps; [ iotawattpy ]; "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 "ipma" = ps: with ps; [ pyipma ]; @@ -424,6 +426,7 @@ "itach" = ps: with ps; [ ]; # missing inputs: pyitachip2ir "itunes" = ps: with ps; [ ]; "izone" = ps: with ps; [ python-izone ]; + "jellyfin" = ps: with ps; [ jellyfin-apiclient-python ]; "jewish_calendar" = ps: with ps; [ hdate ]; "joaoapps_join" = ps: with ps; [ ]; # missing inputs: python-join-api "juicenet" = ps: with ps; [ python-juicenet ]; @@ -476,7 +479,6 @@ "london_air" = ps: with ps; [ ]; "london_underground" = ps: with ps; [ ]; # missing inputs: london-tube-status "lookin" = ps: with ps; [ aiolookin ]; - "loopenergy" = ps: with ps; [ ]; # missing inputs: pyloopenergy "lovelace" = ps: with ps; [ ]; "luci" = ps: with ps; [ openwrt-luci-rpc ]; "luftdaten" = ps: with ps; [ luftdaten ]; @@ -519,7 +521,7 @@ "microsoft_face_identify" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; "miflora" = ps: with ps; [ bluepy ]; # missing inputs: miflora "mikrotik" = ps: with ps; [ librouteros ]; - "mill" = ps: with ps; [ millheater ]; + "mill" = ps: with ps; [ mill-local millheater ]; "min_max" = ps: with ps; [ ]; "minecraft_server" = ps: with ps; [ aiodns getmac mcstatus ]; "minio" = ps: with ps; [ minio ]; @@ -547,7 +549,6 @@ "mutesync" = ps: with ps; [ mutesync ]; "mvglive" = ps: with ps; [ PyMVGLive ]; "my" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; - "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi "myq" = ps: with ps; [ pymyq ]; "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt pymysensors ]; @@ -695,6 +696,7 @@ "random" = ps: with ps; [ ]; "raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client + "rdw" = ps: with ps; [ vehicle ]; "recollect_waste" = ps: with ps; [ aiorecollect ]; "recorder" = ps: with ps; [ sqlalchemy ]; "recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch @@ -709,6 +711,7 @@ "rest_command" = ps: with ps; [ ]; "rflink" = ps: with ps; [ rflink ]; "rfxtrx" = ps: with ps; [ pyrfxtrx ]; + "ridwell" = ps: with ps; [ aioridwell ]; "ring" = ps: with ps; [ ha-ffmpeg ring-doorbell ]; "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api "risco" = ps: with ps; [ pyrisco ]; @@ -852,6 +855,7 @@ "tado" = ps: with ps; [ python-tado ]; "tag" = ps: with ps; [ ]; "tahoma" = ps: with ps; [ tahoma-api ]; + "tailscale" = ps: with ps; [ tailscale ]; "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility "tankerkoenig" = ps: with ps; [ pytankerkoenig ]; "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff @@ -867,6 +871,7 @@ "temper" = ps: with ps; [ ]; # missing inputs: temperusb "template" = ps: with ps; [ ]; "tensorflow" = ps: with ps; [ numpy pillow pycocotools tensorflow ]; # missing inputs: tf-models-official + "tesla_wall_connector" = ps: with ps; [ tesla-wall-connector ]; "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac "thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke "thethingsnetwork" = ps: with ps; [ ]; @@ -883,6 +888,7 @@ "tod" = ps: with ps; [ ]; "todoist" = ps: with ps; [ todoist ]; "tof" = ps: with ps; [ ]; # missing inputs: RPi.GPIO VL53L1X2 + "tolo" = ps: with ps; [ tololib ]; "tomato" = ps: with ps; [ ]; "toon" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa toonapi ]; "torque" = ps: with ps; [ aiohttp-cors ]; @@ -995,7 +1001,7 @@ "yamaha_musiccast" = ps: with ps; [ aiohttp-cors aiomusiccast async-upnp-client ifaddr zeroconf ]; "yandex_transport" = ps: with ps; [ aioymaps ]; "yandextts" = ps: with ps; [ ]; - "yeelight" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr yeelight ]; + "yeelight" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr yeelight zeroconf ]; "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; "youless" = ps: with ps; [ youless-api ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9d6618452e6a..f3beafdf388c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,7 +1,10 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , python3 +, substituteAll +, ffmpeg , inetutils , nixosTests @@ -21,10 +24,6 @@ let defaultOverrides = [ - # Remove with Home Assistant 2021.12 - (mkOverride "aiohue" "2.6.3" "sha256-zpwkDKPrE5TFZQO0A1ifTQ7n+TRFpXi3jai3h5plyGM=") - (mkOverride "PyChromecast" "9.4.0" "sha256-Y8PLrjxZHml7BmklEJ/VXGqkRyneAy+QVA5rusPeBHQ=") - # aiounify 29 breaks integration tests (self: super: { aiounifi = super.aiounifi.overridePythonAttrs (oldAttrs: rec { @@ -41,6 +40,87 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") + (self: super: { + httpcore = super.httpcore.overridePythonAttrs (oldAttrs: rec { + version = "0.14.3"; + src = fetchFromGitHub { + owner = "encode"; + repo = "httpcore"; + rev = version; + sha256 = "sha256-jPsbMhY1lWKBXlh6hsX6DGKXi/g7VQSU00tF6H7qkOo="; + }; + propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ python3.pkgs.certifi ]; + doCheck = false; + }); + }) + + (self: super: { + httpx = super.httpx.overridePythonAttrs (oldAttrs: rec { + version = "0.21.1"; + src = fetchFromGitHub { + owner = "encode"; + repo = "httpx"; + rev = version; + sha256 = "sha256-ayhLP+1hPWAx2ds227CKp5cebVkD5B2Z59L+3dzdINc="; + }; + doCheck = false; + }); + }) + + (self: super: { + pytest-httpx = super.pytest-httpx.overridePythonAttrs (oldAttrs: rec { + version = "0.15.0"; + src = fetchFromGitHub { + owner = "Colin-bin"; + repo = "pytest_httpx"; + rev = "v${version}"; + sha256 = "08dxvjkxlnam3r0yp17495d1vksyawzzkpykacjql1gi6hqlfrwg"; + }; + }); + }) + + (self: super: { + respx = super.respx.overridePythonAttrs (oldAttrs: rec { + version = "0.19.0"; + src = fetchFromGitHub { + owner = "lundberg"; + repo = "respx"; + rev = version; + sha256 = "sha256-xiAt42kc1+rro99KMwzYKi3XC+wxYVqOY11tM+M/uV8="; + }; + }); + }) + + (self: super: { + envoy-reader = super.envoy-reader.overridePythonAttrs (oldAttrs: rec { + patches = [ + # Support for later httpx, https://github.com/jesserizzo/envoy_reader/pull/82 + (fetchpatch { + name = "support-later-httpx.patch"; + url = "https://github.com/jesserizzo/envoy_reader/commit/6019a89419fe9c830ba839be7d39ec54725268b0.patch"; + sha256 = "17vsrx13rskvh8swvjisb2dk6x1jdbjcm8ikkpidia35pa24h272"; + }) + ]; + }); + }) + + (self: super: { + sanic = super.sanic.overridePythonAttrs (oldAttrs: rec { + version = "21.9.3"; + src = fetchFromGitHub { + owner = "sanic-org"; + repo = "sanic"; + rev = "v${version}"; + sha256 = "0m18jdw1mvf7jhpnrxhm96p24pxvv0h9m71a8c7sqqkwnnpa3p5i"; + }; + disabledTests = oldAttrs.disabledTests ++ [ + "test_redirect" + "test_chained_redirect" + "test_unix_connection" + ]; + }); + }) + (self: super: { huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec { version = "1.4.18"; @@ -82,17 +162,7 @@ let }); }) - (self: super: { - nettigo-air-monitor = super.nettigo-air-monitor.overridePythonAttrs (oldAttrs: rec { - version = "1.1.1"; - src = fetchFromGitHub { - owner = "bieniu"; - repo = "nettigo-air-monitor"; - rev = version; - sha256 = "sha256-OIB1d6XtstUr5P0q/dmyJS7+UbtkFQIiuSnzwcdP1mE="; - }; - }); - }) + (mkOverride "jinja2" "3.0.3" "1mvwr02s86zck5wsmd9wjxxb9iaqr17hdi5xza9vkwv8rmrv46v1") # Pinned due to API changes in pyruckus>0.12 (self: super: { @@ -123,6 +193,32 @@ let # Pinned due to API changes in 0.1.0 (mkOverride "poolsense" "0.0.8" "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp") + # Pinned due to API changes in 0.4.0 + (self: super: { + vilfo-api-client = super.vilfo-api-client.overridePythonAttrs (oldAttrs: rec { + version = "0.3.3"; + src = fetchFromGitHub { + owner = "ManneW"; + repo = "vilfo-api-client-python"; + rev = "v$version}"; + sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf"; + }; + }); + }) + + # Pinned due to API changes ~1.0 + (self: super: { + vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { + version = "0.1.2"; + src = fetchFromGitHub { + owner = "spry-group"; + repo = "python-vultr"; + rev = "v${version}"; + sha256 = "1qjvvr2v9gfnwskdl0ayazpcmiyw9zlgnijnhgq9mcri5gq9jw5h"; + }; + }); + }) + # home-assistant-frontend does not exist in python3.pkgs (self: super: { home-assistant-frontend = self.callPackage ./frontend.nix { }; @@ -156,7 +252,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.11.5"; + hassVersion = "2021.12.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -173,20 +269,25 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "sha256-5MxArJLzOg9dU4Q2c6BDjvEzR2u7UVumNZjwE84+br8="; + hash = "sha256:00hi709pb06c4ki0zb42my6g9cifrp2pn04ygrn5i7q7sr6min71"; }; # leave this in, so users don't have to constantly update their downstream patch handling patches = [ - ./0001-tests-ignore-OSErrors-in-hass-fixture.patch + (substituteAll { + src = ./patches/ffmpeg-path.patch; + ffmpeg = "${lib.getBin ffmpeg}/bin/ffmpeg"; + }) + ./patches/tests-ignore-OSErrors-in-hass-fixture.patch ]; postPatch = '' substituteInPlace setup.py \ - --replace "async_timeout==3.0.1" "async_timeout" \ - --replace "awesomeversion==21.10.1" "awesomeversion" \ - --replace "aiohttp==3.7.4.post0" "aiohttp" \ + --replace "aiohttp==3.8.1" "aiohttp" \ + --replace "async_timeout==4.0.0" "async_timeout" \ --replace "bcrypt==3.1.7" "bcrypt" \ + --replace "cryptography==35.0.0" "cryptography" \ + --replace "httpx==0.21.0" "httpx" \ --replace "pip>=8.0.3,<20.3" "pip" \ --replace "pyyaml==6.0" "pyyaml" \ --replace "yarl==1.6.3" "yarl" @@ -198,6 +299,7 @@ in with py.pkgs; buildPythonApplication rec { aiohttp astral async-timeout + atomicwrites attrs awesomeversion bcrypt @@ -347,7 +449,6 @@ in with py.pkgs; buildPythonApplication rec { "dte_energy_bridge" "duckdns" "dunehd" - "dyson" "eafm" "ecobee" "econet" @@ -406,7 +507,8 @@ in with py.pkgs; buildPythonApplication rec { "geonetnz_quakes" "geonetnz_volcano" "gios" - "glances" + # updated to incompatible version and overriding is annoying because of async_timeout<4 pin + # "glances" "goalzero" "gogogate2" "google" @@ -686,8 +788,6 @@ in with py.pkgs; buildPythonApplication rec { "telegram" "tellduslive" "template" - # disable tesla comonent tests while typer is incompatible with click>=8.0 - # "tesla" "threshold" "tibber" "tile" @@ -726,7 +826,8 @@ in with py.pkgs; buildPythonApplication rec { "uvc" "vacuum" "velbus" - "venstar" + # disabled, because it includes onewire component tests, for which we lack p1wire dependency + # "venstar" "vera" "verisure" "version" @@ -736,8 +837,7 @@ in with py.pkgs; buildPythonApplication rec { "vlc_telnet" "voicerss" "volumio" - # disabled, becaused AttributeError: does not have the attribute 'server_list' - # "vultr" + "vultr" "wake_on_lan" "wallbox" "water_heater" @@ -756,7 +856,8 @@ in with py.pkgs; buildPythonApplication rec { "xbox" "xiaomi" "xiaomi_aqara" - "xiaomi_miio" + # disabled, because we require cryptography>=35.0 for the miio package + # "xiaomi_miio" "yamaha" "yandex_transport" "yandextts" @@ -873,6 +974,8 @@ in with py.pkgs; buildPythonApplication rec { preCheck = '' export HOME="$TEMPDIR" + patch -p1 < ${./patches/tests-mock-source-ip.patch} + # the tests require the existance of a media dir mkdir /build/media diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index bf614a11e027..ae8b2f0fb5d0 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20211109.0"; + version = "20211211.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DXL+D58kS8q4we6/r6iRuXA/d9NOoYUp9A3vsHQ0KVg="; + sha256 = "sha256-+rUrNCWf7CBzTPGuK7m88c1ouApelGla/L3SBwxYqdQ="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/patches/ffmpeg-path.patch b/pkgs/servers/home-assistant/patches/ffmpeg-path.patch new file mode 100644 index 000000000000..a72674ff7a5f --- /dev/null +++ b/pkgs/servers/home-assistant/patches/ffmpeg-path.patch @@ -0,0 +1,84 @@ +diff --git a/homeassistant/components/ffmpeg/__init__.py b/homeassistant/components/ffmpeg/__init__.py +index 74c826f47d..91f359da2a 100644 +--- a/homeassistant/components/ffmpeg/__init__.py ++++ b/homeassistant/components/ffmpeg/__init__.py +@@ -40,7 +40,7 @@ CONF_FFMPEG_BIN = "ffmpeg_bin" + CONF_EXTRA_ARGUMENTS = "extra_arguments" + CONF_OUTPUT = "output" + +-DEFAULT_BINARY = "ffmpeg" ++DEFAULT_BINARY = "@ffmpeg@" + + CONFIG_SCHEMA = vol.Schema( + { +diff --git a/tests/components/ffmpeg/test_init.py b/tests/components/ffmpeg/test_init.py +index e1730ffdab..e9cd7934fd 100644 +--- a/tests/components/ffmpeg/test_init.py ++++ b/tests/components/ffmpeg/test_init.py +@@ -87,7 +87,7 @@ class TestFFmpegSetup: + with assert_setup_component(1): + setup_component(self.hass, ffmpeg.DOMAIN, {ffmpeg.DOMAIN: {}}) + +- assert self.hass.data[ffmpeg.DATA_FFMPEG].binary == "ffmpeg" ++ assert self.hass.data[ffmpeg.DATA_FFMPEG].binary == "@ffmpeg@" + + def test_setup_component_test_service(self): + """Set up ffmpeg component test services.""" +diff --git a/tests/components/ffmpeg/test_sensor.py b/tests/components/ffmpeg/test_sensor.py +index a6c9c1f441..f13091da1a 100644 +--- a/tests/components/ffmpeg/test_sensor.py ++++ b/tests/components/ffmpeg/test_sensor.py +@@ -27,7 +27,7 @@ class TestFFmpegNoiseSetup: + setup_component(self.hass, "binary_sensor", self.config) + self.hass.block_till_done() + +- assert self.hass.data["ffmpeg"].binary == "ffmpeg" ++ assert self.hass.data["ffmpeg"].binary == "@ffmpeg@" + assert self.hass.states.get("binary_sensor.ffmpeg_noise") is not None + + @patch("haffmpeg.sensor.SensorNoise.open_sensor", return_value=mock_coro()) +@@ -37,7 +37,7 @@ class TestFFmpegNoiseSetup: + setup_component(self.hass, "binary_sensor", self.config) + self.hass.block_till_done() + +- assert self.hass.data["ffmpeg"].binary == "ffmpeg" ++ assert self.hass.data["ffmpeg"].binary == "@ffmpeg@" + assert self.hass.states.get("binary_sensor.ffmpeg_noise") is not None + + self.hass.start() +@@ -53,7 +53,7 @@ class TestFFmpegNoiseSetup: + setup_component(self.hass, "binary_sensor", self.config) + self.hass.block_till_done() + +- assert self.hass.data["ffmpeg"].binary == "ffmpeg" ++ assert self.hass.data["ffmpeg"].binary == "@ffmpeg@" + assert self.hass.states.get("binary_sensor.ffmpeg_noise") is not None + + self.hass.start() +@@ -89,7 +89,7 @@ class TestFFmpegMotionSetup: + setup_component(self.hass, "binary_sensor", self.config) + self.hass.block_till_done() + +- assert self.hass.data["ffmpeg"].binary == "ffmpeg" ++ assert self.hass.data["ffmpeg"].binary == "@ffmpeg@" + assert self.hass.states.get("binary_sensor.ffmpeg_motion") is not None + + @patch("haffmpeg.sensor.SensorMotion.open_sensor", return_value=mock_coro()) +@@ -99,7 +99,7 @@ class TestFFmpegMotionSetup: + setup_component(self.hass, "binary_sensor", self.config) + self.hass.block_till_done() + +- assert self.hass.data["ffmpeg"].binary == "ffmpeg" ++ assert self.hass.data["ffmpeg"].binary == "@ffmpeg@" + assert self.hass.states.get("binary_sensor.ffmpeg_motion") is not None + + self.hass.start() +@@ -115,7 +115,7 @@ class TestFFmpegMotionSetup: + setup_component(self.hass, "binary_sensor", self.config) + self.hass.block_till_done() + +- assert self.hass.data["ffmpeg"].binary == "ffmpeg" ++ assert self.hass.data["ffmpeg"].binary == "@ffmpeg@" + assert self.hass.states.get("binary_sensor.ffmpeg_motion") is not None + + self.hass.start() diff --git a/pkgs/servers/home-assistant/0001-tests-ignore-OSErrors-in-hass-fixture.patch b/pkgs/servers/home-assistant/patches/tests-ignore-OSErrors-in-hass-fixture.patch similarity index 100% rename from pkgs/servers/home-assistant/0001-tests-ignore-OSErrors-in-hass-fixture.patch rename to pkgs/servers/home-assistant/patches/tests-ignore-OSErrors-in-hass-fixture.patch diff --git a/pkgs/servers/home-assistant/patches/tests-mock-source-ip.patch b/pkgs/servers/home-assistant/patches/tests-mock-source-ip.patch new file mode 100644 index 000000000000..4094d08ee7ff --- /dev/null +++ b/pkgs/servers/home-assistant/patches/tests-mock-source-ip.patch @@ -0,0 +1,13 @@ +diff --git a/homeassistant/components/network/__init__.py b/homeassistant/components/network/__init__.py +index 7cc864727d..69333a5454 100644 +--- a/homeassistant/components/network/__init__.py ++++ b/homeassistant/components/network/__init__.py +@@ -26,7 +26,7 @@ async def async_get_source_ip( + ) -> str: + """Get the source ip for a target ip.""" + adapters = await async_get_adapters(hass) +- all_ipv4s = [] ++ all_ipv4s = ["127.0.0.1"] + for adapter in adapters: + if adapter["enabled"] and (ipv4s := adapter["ipv4"]): + all_ipv4s.extend([ipv4["address"] for ipv4 in ipv4s]) diff --git a/pkgs/servers/home-assistant/update.sh b/pkgs/servers/home-assistant/update.sh index 8a47daf51c55..05f2e93dfe46 100755 --- a/pkgs/servers/home-assistant/update.sh +++ b/pkgs/servers/home-assistant/update.sh @@ -6,7 +6,7 @@ set -eux DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" cd "$DIR" -CURRENT_VERSION=$(nix eval --raw '(with import ../../.. {}; home-assistant.version)') +CURRENT_VERSION=$(nix-instantiate ../../.. --eval --strict -A home-assistant.version | tr -d '"') TARGET_VERSION=$(curl https://api.github.com/repos/home-assistant/core/releases/latest | jq -r '.name') MANIFEST=$(curl https://raw.githubusercontent.com/home-assistant/core/${TARGET_VERSION}/homeassistant/components/frontend/manifest.json) FRONTEND_VERSION=$(echo $MANIFEST | jq -r '.requirements[] | select(startswith("home-assistant-frontend")) | sub(".*==(?.*)"; .vers)') From 510d7ec6d71c176c26dc393e8f38af6843a343ec Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 12 Dec 2021 13:32:55 +0100 Subject: [PATCH 094/104] python3Packages.velbus-aio: fetch submodules --- pkgs/development/python-modules/velbus-aio/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index db9721641cfd..e871912adf7a 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -19,7 +19,8 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - sha256 = "sha256-itaYSfZm+/vF/tKRO2BW4qXrDXP0YfBrKiq9bMGFj0M="; + sha256 = "0i1vfyhyvn908vz55agmfds3zwp6qpbpip055d995nx79ysxz0j9"; + fetchSubmodules = true; }; propagatedBuildInputs = [ From 4cc23f2b1e1b9ae443d257129001caebca464d2f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 7 Dec 2021 22:08:49 +0100 Subject: [PATCH 095/104] why3.withProvers: add dontUnpack --- pkgs/applications/science/logic/why3/with-provers.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/why3/with-provers.nix b/pkgs/applications/science/logic/why3/with-provers.nix index fc08f5d7c85e..826473b38e9f 100644 --- a/pkgs/applications/science/logic/why3/with-provers.nix +++ b/pkgs/applications/science/logic/why3/with-provers.nix @@ -17,9 +17,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ why3 ] ++ provers; + dontUnpack = true; + buildPhase = '' mkdir -p $out/share/why3/ - why3 config --detect-provers -C $out/share/why3/why3.conf + why3 config detect -C $out/share/why3/why3.conf awk -i inplace -f ${configAwkScript} $out/share/why3/why3.conf ''; From 9ec8e461418c18766a6abdfb2345ef22a10d1e09 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 12 Dec 2021 20:41:49 +0100 Subject: [PATCH 096/104] coqPackages.serapi: init at 8.14.0+0.14.0 for Coq 8.14 & OCaml < 4.12 (#148775) --- pkgs/development/coq-modules/serapi/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index 301e5975c576..383151a1cb5e 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -15,6 +15,7 @@ let }); release = { + "8.14.0+0.14.0".sha256 = "sha256:1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d"; "8.14+rc1+0.14.0".sha256 = "1w7d7anvcfx8vz51mnrf1jkw6rlpzjkjlr06avf58wlhymww7pja"; "8.13.0+0.13.0".sha256 = "0k69907xn4k61w4mkhwf8kh8drw9pijk9ynijsppihw98j8w38fy"; "8.12.0+0.12.1".sha256 = "048x3sgcq4h845hi6hm4j4dsfca8zfj70dm42w68n63qcm6xf9hn"; @@ -27,7 +28,11 @@ in pname = "serapi"; inherit version release; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with versions; + if isGe "4.12" coq.ocamlPackages.ocaml.version then null + else + switch coq.version [ + { case = isEq "8.14"; out = "8.14.0+0.14.0"; } { case = isEq "8.13"; out = "8.13.0+0.13.0"; } { case = isEq "8.12"; out = "8.12.0+0.12.1"; } { case = isEq "8.11"; out = "8.11.0+0.11.1"; } From 760a55ab931022795396e37985718e2c08107b22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 19:58:14 +0000 Subject: [PATCH 097/104] python38Packages.plaid-python: 8.7.0 -> 8.8.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index babca1715d91..31a62c109646 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "8.7.0"; + version = "8.8.0"; src = fetchPypi { inherit pname version; - sha256 = "16b23f61deab24d406536a1fd172da77bcbb28b3ca322245b8ee9203350fb57d"; + sha256 = "8689b5c4d69e93026aea252314fb3133359fa70df5819ad6995c4e44a2f84858"; }; propagatedBuildInputs = [ From bf2ed226735fc51634d9b3b147deb62e6a8e31a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 01:26:42 +0000 Subject: [PATCH 098/104] gnome.gnome-calendar: 41.1 -> 41.2 --- pkgs/desktops/gnome/apps/gnome-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index 89b6b1e384c3..db353165c28d 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "41.1"; + version = "41.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "m1EmsjPhuPic9MIyYIlXHYKakwPsieplz2IWTmp0IuE="; + sha256 = "lWsvGQMiZRxn/mZyI4lviqWs8ztwraWjsFpTYb2mYRo="; }; patches = [ From b27d0da9d87ed6bc65a4c677e8cb9f4ebd410234 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Nov 2021 20:17:04 +0100 Subject: [PATCH 099/104] python3Packages.pyoctoprintapi: init at 0.1.7 --- .../python-modules/pyoctoprintapi/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/pyoctoprintapi/default.nix diff --git a/pkgs/development/python-modules/pyoctoprintapi/default.nix b/pkgs/development/python-modules/pyoctoprintapi/default.nix new file mode 100644 index 000000000000..323d2c092f8d --- /dev/null +++ b/pkgs/development/python-modules/pyoctoprintapi/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# propagated +, aiohttp + +# tests +, pytest-asyncio +, pytestCheckHook +}: + +let + pname = "pyoctoprintapi"; + version = "0.1.7"; +in +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "rfleming71"; + repo = pname; + rev = "v${version}"; + hash = "sha256-XAMHQ7n03e10hFcPIUqyCDlRk2uO8dX8Iq0mdY7wRGE="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + pythonImportsCheck = [ + "pyoctoprintapi" + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + meta = with lib; { + description = "Simple async wrapper around the Octoprint API"; + homepage = "https://github.com/rfleming71/pyoctoprintapi"; + license = licenses.mit; + maintainers= with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 706280b5733c..dfb70f9a304b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6942,6 +6942,8 @@ in { tesseract = pkgs.tesseract4; }; + pyoctoprintapi = callPackage ../development/python-modules/pyoctoprintapi { }; + pyodbc = callPackage ../development/python-modules/pyodbc { }; pyogg = callPackage ../development/python-modules/pyogg { }; From 1180267064d2a7c098d53438a58c6155fb121226 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Nov 2021 20:19:15 +0100 Subject: [PATCH 100/104] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 5fccf5816d8c..c7cbae360a11 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -596,7 +596,7 @@ "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics "obihai" = ps: with ps; [ pyobihai ]; - "octoprint" = ps: with ps; [ ]; # missing inputs: pyoctoprintapi + "octoprint" = ps: with ps; [ pyoctoprintapi ]; "oem" = ps: with ps; [ oemthermostat ]; "ohmconnect" = ps: with ps; [ defusedxml ]; "ombi" = ps: with ps; [ pyombi ]; From 1445fca5d67e63c4a1ba116de42d1693e04e7ccb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Nov 2021 20:19:57 +0100 Subject: [PATCH 101/104] home-assistant: test octoprint component --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9d6618452e6a..bad96cf62570 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -556,6 +556,7 @@ in with py.pkgs; buildPythonApplication rec { "number" "nws" "nx584" + "octoprint" "omnilogic" "onboarding" "ondilo_ico" From 8fda3f6989d73729ad6a92fe59573a0b5dd9b55b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 12 Dec 2021 20:44:15 +0100 Subject: [PATCH 102/104] jackline: use default version of OCaml --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65508b727f21..6bc8b1aadfd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25913,9 +25913,7 @@ with pkgs; indigenous-desktop = callPackage ../applications/networking/feedreaders/indigenous-desktop { }; - jackline = callPackage ../applications/networking/instant-messengers/jackline { - ocamlPackages = ocaml-ng.ocamlPackages_4_08; - }; + jackline = callPackage ../applications/networking/instant-messengers/jackline { }; leftwm = callPackage ../applications/window-managers/leftwm { }; From 79ab6a83828ecee660e362e6c97384ff0489f9b2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 12 Dec 2021 22:10:55 +0100 Subject: [PATCH 103/104] signald: incorporate log4j update for CVE-2021-44228 Currently, the log4j update needed to mitigate CVE-2021-44228[1] is not yet part of a release, so we apply the commit[2] as patch for now. Relevant for #150288 [1] https://nvd.nist.gov/vuln/detail/CVE-2021-44228 [2] https://gitlab.com/signald/signald/-/commit/7f668062ab9ffa09a49d171e995f57cf0a0803a7 --- .../instant-messengers/signald/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index 159dfdc0310e..e75c2357b28b 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle_6, git, perl -, makeWrapper }: +, makeWrapper, fetchpatch +}: let pname = "signald"; @@ -12,6 +13,11 @@ let sha256 = "ftK+oeqzJ+TxrlvqivFkAi5RCcyJ5Y0oQAJuo0YheBg="; }; + log4j-update-cve-2021-44228 = fetchpatch { + url = "https://gitlab.com/signald/signald/-/commit/7f668062ab9ffa09a49d171e995f57cf0a0803a7.patch"; + sha256 = "sha256-504je6hKciUGelVCGZjxGjHi1qZQaovagXD5PBQP+mM="; + }; + buildConfigJar = fetchurl { url = "https://dl.bintray.com/mfuerstenau/maven/gradle/plugin/de/fuerstenau/BuildConfigPlugin/1.1.8/BuildConfigPlugin-1.1.8.jar"; sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f"; @@ -21,6 +27,7 @@ let deps = stdenv.mkDerivation { pname = "${pname}-deps"; inherit src version; + patches = [ log4j-update-cve-2021-44228 ]; nativeBuildInputs = [ gradle_6 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -38,15 +45,18 @@ let outputHashMode = "recursive"; # Downloaded jars differ by platform outputHash = { - x86_64-linux = "gEaOOsELhfKC1cFV8tqRHbBUI6+M/cDOaqN8FQ1J/TE="; - aarch64-linux = "UhnQ+Ge48/NdTqUWIxd0VNadHFvQ9awBTtn65Nz3+UM="; + x86_64-linux = "sha256-e2Tehtznc+VsvQzD3lQ50Lg7ipQc7P3ekOnb8XLORO8="; + aarch64-linux = "sha256-P48s3vG5vUNxCCga5FhzpODhlvvc+F2ZZGX/G0FVGWc="; }.${stdenv.system} or (throw "Unsupported platform"); }; in stdenv.mkDerivation rec { inherit pname src version; - patches = [ ./gradle-plugin.patch ]; + patches = [ + ./gradle-plugin.patch + log4j-update-cve-2021-44228 + ]; postPatch = '' sed -i 's|BuildConfig.jar|${buildConfigJar}|' build.gradle From 03d3ea77984738f095b8867f4ae7354616b0fa17 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Sun, 12 Dec 2021 15:29:29 -0600 Subject: [PATCH 104/104] imgui: init at 1.85 --- pkgs/development/libraries/imgui/default.nix | 32 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/imgui/default.nix diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix new file mode 100644 index 000000000000..94dd9f95d390 --- /dev/null +++ b/pkgs/development/libraries/imgui/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "imgui"; + version = "1.85"; + + src = fetchFromGitHub { + owner = "ocornut"; + repo = "imgui"; + rev = "v${version}"; + sha256 = "sha256-HQsGlsvmf3ikqhGnJHf/d6SRCY/QDeW7XUTwXQH/JYE="; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/include/imgui + + cp *.h $out/include/imgui + cp *.cpp $out/include/imgui + cp -a backends $out/include/imgui/ + cp -a misc $out/include/imgui/ + ''; + + meta = with lib; { + description = "Bloat-free Graphical User interface for C++ with minimal dependencies"; + homepage = "https://github.com/ocornut/imgui"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87fa52f4d360..ef0e6c35a201 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17087,6 +17087,8 @@ with pkgs; ilmbase = callPackage ../development/libraries/ilmbase { }; + imgui = callPackage ../development/libraries/imgui { }; + imlib = callPackage ../development/libraries/imlib { libpng = libpng12; };