From 34f6106f66b00f65321c51af0c6714ed63e3866e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 29 Nov 2021 09:12:46 +0100 Subject: [PATCH 01/29] 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 d4f617aa730a402ed721bcfe4d4619a395b45ae4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 09:58:45 +0000 Subject: [PATCH 02/29] 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 03/29] 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 04/29] 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 10ddd4c7e854d4df128c707ecaacb011c6072c27 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 10 Dec 2021 11:45:12 -0500 Subject: [PATCH 05/29] 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 6684029b0cf28e243f478039e200b994d7da221c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 11 Dec 2021 04:20:00 +0000 Subject: [PATCH 06/29] 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 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 07/29] 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 08/29] 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 09/29] 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 b2aa4f1f251a8747485cfd0168c5ca3ee47a0fee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Dec 2021 20:17:44 +0100 Subject: [PATCH 10/29] 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 90185d9f22a8ebb2de75d366016d08c4c8387a0c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Dec 2021 23:01:07 +0100 Subject: [PATCH 11/29] 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 20371fd18ce6f212ba921570ebe2a9b3d014e273 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 11 Dec 2021 23:54:51 +0100 Subject: [PATCH 12/29] 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 13/29] 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 1c55acf8cd116c0121dc2b7bba8cf246e07509d2 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 8 Dec 2021 00:52:45 +0100 Subject: [PATCH 14/29] 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 15/29] 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 82c838356d86ee7305ddfdad3a7f3ca96c3fac2d Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Sun, 12 Dec 2021 05:41:38 -0300 Subject: [PATCH 16/29] 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 17/29] 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 e992604bf0b4afb4c3e8ccad04d6ea69bba49681 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sat, 11 Dec 2021 15:04:24 -0800 Subject: [PATCH 18/29] 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 ad9c4bcf5286c3bcf220afd7fde96b6e4f40ef01 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 12 Dec 2021 12:00:06 +0100 Subject: [PATCH 19/29] 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 20/29] 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 21/29] 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 22/29] 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 23/29] 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 24/29] 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 25/29] 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 26/29] 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 27/29] 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 28/29] 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 60a72578ff96e6a7c5166f62aadab08af389f04c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 Dec 2021 22:06:40 +0000 Subject: [PATCH 29/29] 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;