diff --git a/pkgs/servers/mjolnir/default.nix b/pkgs/servers/mjolnir/default.nix index bc20f68cc0e2..f6444ef386ac 100644 --- a/pkgs/servers/mjolnir/default.nix +++ b/pkgs/servers/mjolnir/default.nix @@ -2,7 +2,6 @@ , nixosTests , stdenv , fetchFromGitHub -, fetchpatch , makeWrapper , nodejs , pkgs @@ -10,23 +9,15 @@ stdenv.mkDerivation rec { pname = "mjolnir"; - version = "0.1.18"; + version = "1.1.20"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; rev = "v${version}"; - sha256 = "BIZUfgetkHlnPg+SWyfQgljjxIeWhHpibPVoTfTpS2k="; + sha256 = "yfMBnNriSpwitR4u664iz+8uWp/3iSTymyFajMBP5xg="; }; - patches = [ - # catch errors and set non-zero exit code - (fetchpatch { - url = "https://github.com/matrix-org/mjolnir/pull/102/commits/662b06df8ef085fb78608ed19924383be62fa59f.patch"; - sha256 = "sha256-VUKFBMM67E8dGWSViDjMJadMS+DgvHvQS0aOnd2Fz/4="; - }) - ]; - nativeBuildInputs = [ nodejs makeWrapper diff --git a/pkgs/servers/mjolnir/node-deps.nix b/pkgs/servers/mjolnir/node-deps.nix index 030b41fe6e15..30c8a33277e4 100644 --- a/pkgs/servers/mjolnir/node-deps.nix +++ b/pkgs/servers/mjolnir/node-deps.nix @@ -13,13 +13,13 @@ let sha512 = "9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw=="; }; }; - "@babel/helper-validator-identifier-7.14.5" = { + "@babel/helper-validator-identifier-7.15.7" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.14.5"; + version = "7.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz"; - sha512 = "5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; + sha512 = "K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="; }; }; "@babel/highlight-7.14.5" = { @@ -31,49 +31,49 @@ let sha512 = "qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg=="; }; }; - "@jest/types-27.0.6" = { + "@jest/types-27.1.1" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "27.0.6"; + version = "27.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-27.0.6.tgz"; - sha512 = "aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g=="; + url = "https://registry.npmjs.org/@jest/types/-/types-27.1.1.tgz"; + sha512 = "yqJPDDseb0mXgKqmNqypCsb85C22K1aY5+LUxh7syIM9n/b0AsaltxNy+o6tt29VcfGDpYEve175bm3uOhcehA=="; }; }; - "@types/body-parser-1.19.0" = { + "@types/body-parser-1.19.1" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; - version = "1.19.0"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.1.tgz"; + sha512 = "a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg=="; }; }; - "@types/connect-3.4.34" = { + "@types/connect-3.4.35" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; - version = "3.4.34"; + version = "3.4.35"; src = fetchurl { - url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz"; - sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ=="; + url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz"; + sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; }; }; - "@types/express-4.17.12" = { + "@types/express-4.17.13" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.12"; + version = "4.17.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.12.tgz"; - sha512 = "pTYas6FrP15B1Oa0bkN5tQMNqOcVXa9j4FTFtO8DWI9kppKib+6NJtfTOOLcwxuuYvcX2+dVG6et1SxW/Kc17Q=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz"; + sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; - "@types/express-serve-static-core-4.17.22" = { + "@types/express-serve-static-core-4.17.24" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.22"; + version = "4.17.24"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.22.tgz"; - sha512 = "WdqmrUsRS4ootGha6tVwk/IVHM1iorU8tGehftQD2NWiPniw/sm7xdJOIlXLwqdInL9wBw/p7oO8vaYEF3NDmA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz"; + sha512 = "3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA=="; }; }; "@types/istanbul-lib-coverage-2.0.3" = { @@ -121,13 +121,13 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/mocha-8.2.2" = { + "@types/mocha-9.0.0" = { name = "_at_types_slash_mocha"; packageName = "@types/mocha"; - version = "8.2.2"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.2.tgz"; - sha512 = "Lwh0lzzqT5Pqh6z61P3c3P5nm6fzQK/MMHl9UKeneAeInVflBSz1O2EkX6gM6xfJd7FBXBY5purtLx7fUiZ7Hw=="; + url = "https://registry.npmjs.org/@types/mocha/-/mocha-9.0.0.tgz"; + sha512 = "scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA=="; }; }; "@types/node-11.15.54" = { @@ -139,58 +139,58 @@ let sha512 = "1RWYiq+5UfozGsU6MwJyFX6BtktcT10XRjvcAQmskCtMcW3tPske88lM/nHv7BQG1w9KBXI1zPGuu5PnNCX14g=="; }; }; - "@types/qs-6.9.6" = { + "@types/qs-6.9.7" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.6"; + version = "6.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.6.tgz"; - sha512 = "0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA=="; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz"; + sha512 = "FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="; }; }; - "@types/range-parser-1.2.3" = { + "@types/range-parser-1.2.4" = { name = "_at_types_slash_range-parser"; packageName = "@types/range-parser"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz"; - sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; + url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz"; + sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/serve-static-1.13.9" = { + "@types/serve-static-1.13.10" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.9"; + version = "1.13.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz"; - sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz"; + sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ=="; }; }; - "@types/stack-utils-2.0.0" = { + "@types/stack-utils-2.0.1" = { name = "_at_types_slash_stack-utils"; packageName = "@types/stack-utils"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz"; - sha512 = "RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw=="; + url = "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz"; + sha512 = "Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="; }; }; - "@types/yargs-16.0.3" = { + "@types/yargs-16.0.4" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "16.0.3"; + version = "16.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.3.tgz"; - sha512 = "YlFfTGS+zqCgXuXNV26rOIeETOkXnGQXP/pjjL9P0gO/EP9jTmc7pUBhx+jVEIxpq41RX33GQ7N3DzOSfZoglQ=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz"; + sha512 = "T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw=="; }; }; - "@types/yargs-parser-20.2.0" = { + "@types/yargs-parser-20.2.1" = { name = "_at_types_slash_yargs-parser"; packageName = "@types/yargs-parser"; - version = "20.2.0"; + version = "20.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz"; - sha512 = "37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA=="; + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"; + sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; }; }; "@ungap/promise-all-settled-1.1.2" = { @@ -238,13 +238,13 @@ let sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; - "ansi-regex-5.0.0" = { + "ansi-regex-5.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; }; "ansi-styles-3.2.1" = { @@ -445,13 +445,13 @@ let sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; }; }; - "buffer-from-1.1.1" = { + "buffer-from-1.1.2" = { name = "buffer-from"; packageName = "buffer-from"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; }; }; "builtin-modules-1.1.1" = { @@ -499,22 +499,22 @@ let sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; - "chalk-4.1.1" = { + "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz"; - sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg=="; + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; }; - "chokidar-3.5.1" = { + "chokidar-3.5.2" = { name = "chokidar"; packageName = "chokidar"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz"; - sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz"; + sha512 = "ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ=="; }; }; "cliui-7.0.4" = { @@ -562,13 +562,13 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "colorette-1.2.2" = { + "colorette-1.4.0" = { name = "colorette"; packageName = "colorette"; - version = "1.2.2"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz"; - sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="; + url = "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz"; + sha512 = "Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="; }; }; "combined-stream-1.0.8" = { @@ -796,22 +796,22 @@ let sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="; }; }; - "domhandler-4.2.0" = { + "domhandler-4.2.2" = { name = "domhandler"; packageName = "domhandler"; - version = "4.2.0"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz"; - sha512 = "zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA=="; + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz"; + sha512 = "PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w=="; }; }; - "domutils-2.7.0" = { + "domutils-2.8.0" = { name = "domutils"; packageName = "domutils"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz"; - sha512 = "8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg=="; + url = "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"; + sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; }; }; "ecc-jsbn-0.1.2" = { @@ -922,13 +922,13 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "expect-27.0.6" = { + "expect-27.2.1" = { name = "expect"; packageName = "expect"; - version = "27.0.6"; + version = "27.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/expect/-/expect-27.0.6.tgz"; - sha512 = "psNLt8j2kwg42jGBDSfAlU49CEZxejN1f1PlANWDZqIhBOVU/c2Pm888FcjWJzFewhIsNWfZJeLjUjtKGiPuSw=="; + url = "https://registry.npmjs.org/expect/-/expect-27.2.1.tgz"; + sha512 = "ekOA2mBtT2phxcoPVHCXIzbJxCvRXhx2fr7m28IgGdZxUOh8UvxvoRz1FcPlfgZMpE92biHB6woIcAKXqR28hA=="; }; }; "express-4.17.1" = { @@ -1120,13 +1120,13 @@ let sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; }; }; - "graceful-fs-4.2.6" = { + "graceful-fs-4.2.8" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.6"; + version = "4.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz"; - sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; }; }; "growl-1.10.5" = { @@ -1300,13 +1300,13 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; - "is-core-module-2.4.0" = { + "is-core-module-2.6.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.4.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz"; - sha512 = "6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz"; + sha512 = "wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ=="; }; }; "is-extglob-2.1.1" = { @@ -1417,13 +1417,13 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; - "jest-diff-27.0.6" = { + "jest-diff-27.2.0" = { name = "jest-diff"; packageName = "jest-diff"; - version = "27.0.6"; + version = "27.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.0.6.tgz"; - sha512 = "Z1mqgkTCSYaFgwTlP/NUiRzdqgxmmhzHY1Tq17zL94morOHfHu3K4bgSgl+CR4GLhpV8VxkuOYuIWnQ9LnFqmg=="; + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.2.0.tgz"; + sha512 = "QSO9WC6btFYWtRJ3Hac0sRrkspf7B01mGrrQEiCW6TobtViJ9RWL0EmOs/WnBsZDsI/Y2IoSHZA2x6offu0sYw=="; }; }; "jest-get-type-27.0.6" = { @@ -1435,22 +1435,22 @@ let sha512 = "XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg=="; }; }; - "jest-matcher-utils-27.0.6" = { + "jest-matcher-utils-27.2.0" = { name = "jest-matcher-utils"; packageName = "jest-matcher-utils"; - version = "27.0.6"; + version = "27.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz"; - sha512 = "OFgF2VCQx9vdPSYTHWJ9MzFCehs20TsyFi6bIHbk5V1u52zJOnvF0Y/65z3GLZHKRuTgVPY4Z6LVePNahaQ+tA=="; + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.2.0.tgz"; + sha512 = "F+LG3iTwJ0gPjxBX6HCyrARFXq6jjiqhwBQeskkJQgSLeF1j6ui1RTV08SR7O51XTUhtc8zqpDj8iCG4RGmdKw=="; }; }; - "jest-message-util-27.0.6" = { + "jest-message-util-27.2.0" = { name = "jest-message-util"; packageName = "jest-message-util"; - version = "27.0.6"; + version = "27.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.0.6.tgz"; - sha512 = "rBxIs2XK7rGy+zGxgi+UJKP6WqQ+KrBbD1YMj517HYN3v2BG66t3Xan3FWqYHKZwjdB700KiAJ+iES9a0M+ixw=="; + url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.2.0.tgz"; + sha512 = "y+sfT/94CiP8rKXgwCOzO1mUazIEdEhrLjuiu+RKmCP+8O/TJTSne9dqQRbFIHBtlR2+q7cddJlWGir8UATu5w=="; }; }; "jest-regex-util-27.0.6" = { @@ -1669,22 +1669,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.48.0" = { + "mime-db-1.49.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.48.0"; + version = "1.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz"; - sha512 = "FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz"; + sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="; }; }; - "mime-types-2.1.31" = { + "mime-types-2.1.32" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.31"; + version = "2.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz"; - sha512 = "XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz"; + sha512 = "hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="; }; }; "minimalistic-assert-1.0.1" = { @@ -1732,13 +1732,13 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "mocha-9.0.1" = { + "mocha-9.1.1" = { name = "mocha"; packageName = "mocha"; - version = "9.0.1"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.0.1.tgz"; - sha512 = "9zwsavlRO+5csZu6iRtl3GHImAbhERoDsZwdRkdJ/bE+eVplmoxNKE901ZJ9LdSchYBjSCPbjKc5XvcAri2ylw=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.1.1.tgz"; + sha512 = "0wE74YMgOkCgBUj8VyIDwmLUjTsS13WV1Pg7l0SHea2qzZzlq7MDnfbPsHKcELBRk3+izEVkRofjmClpycudCA=="; }; }; "morgan-1.10.0" = { @@ -1795,6 +1795,15 @@ let sha512 = "FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="; }; }; + "nanoid-3.1.25" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.1.25"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz"; + sha512 = "rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q=="; + }; + }; "negotiator-0.6.2" = { name = "negotiator"; packageName = "negotiator"; @@ -1948,22 +1957,22 @@ let sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; }; }; - "postcss-8.3.5" = { + "postcss-8.3.6" = { name = "postcss"; packageName = "postcss"; - version = "8.3.5"; + version = "8.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz"; - sha512 = "NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz"; + sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; }; }; - "pretty-format-27.0.6" = { + "pretty-format-27.2.0" = { name = "pretty-format"; packageName = "pretty-format"; - version = "27.0.6"; + version = "27.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.0.6.tgz"; - sha512 = "8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ=="; + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.0.tgz"; + sha512 = "KyJdmgBkMscLqo8A7K77omgLx5PWPiXJswtTtFV7XgVZv2+qPk6UivpXXO+5k6ZEbWIbLoKdx1pZ6ldINzbwTA=="; }; }; "proxy-addr-2.0.7" = { @@ -2047,13 +2056,13 @@ let sha512 = "w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="; }; }; - "readdirp-3.5.0" = { + "readdirp-3.6.0" = { name = "readdirp"; packageName = "readdirp"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz"; - sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"; + sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; "request-2.88.2" = { @@ -2119,13 +2128,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sanitize-html-2.4.0" = { + "sanitize-html-2.5.1" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "2.4.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.4.0.tgz"; - sha512 = "Y1OgkUiTPMqwZNRLPERSEi39iOebn2XJLbeiGOBhaJD/yLqtLGu6GE5w7evx177LeGgSE+4p4e107LMiydOf6A=="; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.5.1.tgz"; + sha512 = "hUITPitQk+eFNLtr4dEkaaiAJndG2YE87IOpcfBSL1XdklWgwcNDJdr9Ppe8QKL/C3jFt1xH/Mbj20e0GZQOfg=="; }; }; "semver-5.7.1" = { @@ -2146,13 +2155,13 @@ let sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; - "serialize-javascript-5.0.1" = { + "serialize-javascript-6.0.0" = { name = "serialize-javascript"; packageName = "serialize-javascript"; - version = "5.0.1"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; - sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; + sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; }; }; "serve-static-1.14.1" = { @@ -2200,13 +2209,13 @@ let sha512 = "/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug=="; }; }; - "source-map-support-0.5.19" = { + "source-map-support-0.5.20" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.19"; + version = "0.5.20"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; - sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz"; + sha512 = "n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw=="; }; }; "sprintf-js-1.0.3" = { @@ -2227,13 +2236,13 @@ let sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; }; }; - "stack-utils-2.0.3" = { + "stack-utils-2.0.5" = { name = "stack-utils"; packageName = "stack-utils"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz"; - sha512 = "gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw=="; + url = "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz"; + sha512 = "xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA=="; }; }; "statuses-1.5.0" = { @@ -2389,13 +2398,13 @@ let sha512 = "BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw=="; }; }; - "tsconfig-paths-3.9.0" = { + "tsconfig-paths-3.11.0" = { name = "tsconfig-paths"; packageName = "tsconfig-paths"; - version = "3.9.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; - sha512 = "dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw=="; + url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz"; + sha512 = "7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA=="; }; }; "tslib-1.14.1" = { @@ -2452,13 +2461,13 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typescript-4.3.5" = { + "typescript-4.4.3" = { name = "typescript"; packageName = "typescript"; - version = "4.3.5"; + version = "4.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz"; - sha512 = "DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz"; + sha512 = "4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA=="; }; }; "unpipe-1.0.0" = { @@ -2533,13 +2542,13 @@ let sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; }; }; - "workerpool-6.1.4" = { + "workerpool-6.1.5" = { name = "workerpool"; packageName = "workerpool"; - version = "6.1.4"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.1.4.tgz"; - sha512 = "jGWPzsUqzkow8HoAvqaPWTUPCrlPJaJ5tY8Iz7n1uCz3tTp6s3CDG0FF1NsX42WNlkRSW6Mr+CDZGnNoSsKa7g=="; + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz"; + sha512 = "XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw=="; }; }; "wrap-ansi-7.0.0" = { @@ -2627,11 +2636,11 @@ let args = { name = "mjolnir"; packageName = "mjolnir"; - version = "0.1.18"; - src = ../../../../../../../nix/store/mylrlqlb4iz0xx71scm1sirr4x548l8g-source; + version = "1.1.20"; + src = ../../../../../../../nix/store/hc66j9i16g2n08v0laiyydqch4szfygn-source; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -2643,29 +2652,29 @@ let sources."supports-color-5.5.0" ]; }) - sources."@jest/types-27.0.6" - sources."@types/body-parser-1.19.0" - sources."@types/connect-3.4.34" - sources."@types/express-4.17.12" - sources."@types/express-serve-static-core-4.17.22" + sources."@jest/types-27.1.1" + sources."@types/body-parser-1.19.1" + sources."@types/connect-3.4.35" + sources."@types/express-4.17.13" + sources."@types/express-serve-static-core-4.17.24" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" sources."@types/json5-0.0.29" sources."@types/mime-1.3.2" - sources."@types/mocha-8.2.2" + sources."@types/mocha-9.0.0" sources."@types/node-11.15.54" - sources."@types/qs-6.9.6" - sources."@types/range-parser-1.2.3" - sources."@types/serve-static-1.13.9" - sources."@types/stack-utils-2.0.0" - sources."@types/yargs-16.0.3" - sources."@types/yargs-parser-20.2.0" + sources."@types/qs-6.9.7" + sources."@types/range-parser-1.2.4" + sources."@types/serve-static-1.13.10" + sources."@types/stack-utils-2.0.1" + sources."@types/yargs-16.0.4" + sources."@types/yargs-parser-20.2.1" sources."@ungap/promise-all-settled-1.1.2" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ansi-colors-4.1.1" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" sources."argparse-2.0.1" @@ -2685,13 +2694,13 @@ let sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."builtin-modules-1.1.1" sources."bytes-3.1.0" sources."camelcase-6.2.0" sources."caseless-0.12.0" - sources."chalk-4.1.1" - sources."chokidar-3.5.1" + sources."chalk-4.1.2" + sources."chokidar-3.5.2" (sources."cliui-7.0.4" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" @@ -2701,7 +2710,7 @@ let }) sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.2.2" + sources."colorette-1.4.0" sources."combined-stream-1.0.8" sources."commander-2.20.3" sources."concat-map-0.0.1" @@ -2722,14 +2731,14 @@ let sources."diff-sequences-27.0.6" (sources."dom-serializer-1.3.2" // { dependencies = [ - sources."domhandler-4.2.0" + sources."domhandler-4.2.2" ]; }) sources."domelementtype-2.2.0" sources."domhandler-3.3.0" - (sources."domutils-2.7.0" // { + (sources."domutils-2.8.0" // { dependencies = [ - sources."domhandler-4.2.0" + sources."domhandler-4.2.2" ]; }) sources."ecc-jsbn-0.1.2" @@ -2742,7 +2751,7 @@ let sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."etag-1.8.1" - (sources."expect-27.0.6" // { + (sources."expect-27.2.1" // { dependencies = [ sources."ansi-styles-5.2.0" ]; @@ -2768,7 +2777,7 @@ let sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."growl-1.10.5" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -2786,7 +2795,7 @@ let sources."inherits-2.0.3" sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" - sources."is-core-module-2.4.0" + sources."is-core-module-2.6.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -2798,10 +2807,10 @@ let sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" sources."isstream-0.1.2" - sources."jest-diff-27.0.6" + sources."jest-diff-27.2.0" sources."jest-get-type-27.0.6" - sources."jest-matcher-utils-27.0.6" - sources."jest-message-util-27.0.6" + sources."jest-matcher-utils-27.2.0" + sources."jest-message-util-27.2.0" sources."jest-regex-util-27.0.6" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" @@ -2824,13 +2833,13 @@ let sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.48.0" - sources."mime-types-2.1.31" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - (sources."mocha-9.0.1" // { + (sources."mocha-9.1.1" // { dependencies = [ (sources."debug-4.3.1" // { dependencies = [ @@ -2838,6 +2847,7 @@ let ]; }) sources."ms-2.1.3" + sources."nanoid-3.1.23" sources."supports-color-8.1.1" ]; }) @@ -2847,7 +2857,7 @@ let ]; }) sources."ms-2.0.0" - sources."nanoid-3.1.23" + sources."nanoid-3.1.25" sources."negotiator-0.6.2" sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" @@ -2865,8 +2875,8 @@ let sources."performance-now-2.1.0" sources."picomatch-2.3.0" sources."pify-3.0.0" - sources."postcss-8.3.5" - (sources."pretty-format-27.0.6" // { + sources."postcss-8.3.6" + (sources."pretty-format-27.2.0" // { dependencies = [ sources."ansi-styles-5.2.0" ]; @@ -2879,7 +2889,7 @@ let sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."react-is-17.0.2" - sources."readdirp-3.5.0" + sources."readdirp-3.6.0" (sources."request-2.88.2" // { dependencies = [ sources."qs-6.5.2" @@ -2891,9 +2901,9 @@ let sources."resolve-1.20.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - (sources."sanitize-html-2.4.0" // { + (sources."sanitize-html-2.5.1" // { dependencies = [ - sources."domhandler-4.2.0" + sources."domhandler-4.2.2" sources."htmlparser2-6.1.0" ]; }) @@ -2903,16 +2913,16 @@ let sources."ms-2.1.1" ]; }) - sources."serialize-javascript-5.0.1" + sources."serialize-javascript-6.0.0" sources."serve-static-1.14.1" sources."setprototypeof-1.1.1" sources."slash-3.0.0" sources."source-map-0.6.1" sources."source-map-js-0.6.2" - sources."source-map-support-0.5.19" + sources."source-map-support-0.5.20" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" - (sources."stack-utils-2.0.3" // { + (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" ]; @@ -2939,7 +2949,7 @@ let sources."mkdirp-0.5.5" ]; }) - (sources."tsconfig-paths-3.9.0" // { + (sources."tsconfig-paths-3.11.0" // { dependencies = [ sources."json5-1.0.1" ]; @@ -2964,7 +2974,7 @@ let sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."typescript-4.3.5" + sources."typescript-4.4.3" sources."unpipe-1.0.0" sources."uri-js-4.4.1" sources."utils-merge-1.0.1" @@ -2973,7 +2983,7 @@ let sources."verror-1.10.0" sources."which-2.0.2" sources."wide-align-1.1.3" - sources."workerpool-6.1.4" + sources."workerpool-6.1.5" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" diff --git a/pkgs/servers/mjolnir/node-env.nix b/pkgs/servers/mjolnir/node-env.nix index c2b723195b77..21089c4d5459 100644 --- a/pkgs/servers/mjolnir/node-env.nix +++ b/pkgs/servers/mjolnir/node-env.nix @@ -391,13 +391,14 @@ let , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" + , meta ? {} , ... }@args: let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ - name = "node_${name}-${version}"; + name = "${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool @@ -446,6 +447,11 @@ let # Run post install hook, if provided runHook postInstall ''; + + meta = { + # default to Node.js' platforms + platforms = nodejs.meta.platforms; + } // meta; } // extraArgs); # Builds a node environment (a node_modules folder and a set of binaries)