From 0e0dc5544cebe4435031ffaaf00f02bfd9b3aed8 Mon Sep 17 00:00:00 2001 From: oxalica Date: Fri, 18 Sep 2020 02:33:12 +0800 Subject: [PATCH] rust-analyzer: 2020-08-24 -> 2020-09-21 --- .../node-packages/node-packages.nix | 503 +++++++++--------- .../tools/rust/rust-analyzer/default.nix | 6 +- .../tools/rust/rust-analyzer/generic.nix | 26 +- .../rust-analyzer/no-loop-in-const-fn.patch | 223 ++++++++ .../rust/rust-analyzer/no-option-zip.patch | 63 +++ .../rust-analyzer/build-deps/package.json | 28 +- 6 files changed, 569 insertions(+), 280 deletions(-) create mode 100644 pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch create mode 100644 pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 201deab6607..8e0e5ca40ba 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -1723,94 +1723,94 @@ let sha512 = "oJZb4PScX25ZGObpw9n7/bJBE7R0oF6hJ4ABe+WvMqSCI3kxaReMTgJJNIrxpmbXscxWM8U1ndLefP5IjPcU7Q=="; }; }; - "@graphql-tools/delegate-6.2.2" = { + "@graphql-tools/delegate-6.2.3" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.2.2.tgz"; - sha512 = "8VycfZYQ+m4HgajewQT6v6BzAEFxc6mh6rO+uqewnvh143nvv3ud4nXEAfOddUm0PrE6iD3Ng2BZtPSWF5mt+w=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.2.3.tgz"; + sha512 = "j4P7RaI5J9AvGcfBDITO6bZDeSvjMgDby2smn3L2dmXpPfMYh00KRRSZjzdMwSkLxi+0octh9buUAeCdvVMkKQ=="; }; }; - "@graphql-tools/graphql-file-loader-6.2.2" = { + "@graphql-tools/graphql-file-loader-6.2.3" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.2.tgz"; - sha512 = "dKuOk4vH2WWzVGydL13FjdR3WEmJHMoud3MXF9uyvLcjuDm9L0r+PdSI1PSPiCYs7Ii2bJ8zgmdz32jCBHZszA=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.3.tgz"; + sha512 = "9K+foDqfcJXf2jNNOWWZnV+PdxJkKmzAY58qlbFEFfUeRC6ZmOA9B3vTkcFadVdSwIsaWHhaxqHrNAD+OfkAyQ=="; }; }; - "@graphql-tools/import-6.2.2" = { + "@graphql-tools/import-6.2.3" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.2.tgz"; - sha512 = "fxQx+960CBzG6+MGGRaWv9tQ71ir2NZQeVC2dfieQLv5/LXH0fqKe9ltYCfJFskscAmzWeuS19Sibhdn0JMecw=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.3.tgz"; + sha512 = "2ftXR84aPy2ueAEEGw/yFvYGPbvJYs2m18FEODhAq5z4P285ZlCMluxTUR9yNjumzgQP5Eer4fl64ztsdJvCyg=="; }; }; - "@graphql-tools/json-file-loader-6.2.2" = { + "@graphql-tools/json-file-loader-6.2.3" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.2.tgz"; - sha512 = "m/gKQGJS+4bUy/8v0uup3su9RcCLdWvmhYW9+J8WDSzDE2QEdYQMeyDFYV14x0r92IhRpftLd//JvoE3cTV5Kg=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.3.tgz"; + sha512 = "7v445KZLVB3owbibu2HsFmVSsdDOn0NzYSqIXaaIZ7saqoVtG8etSt699kLw5gJM3j0Kjm7XDz9tK60Apes/xg=="; }; }; - "@graphql-tools/load-6.2.2" = { + "@graphql-tools/load-6.2.3" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.2.tgz"; - sha512 = "p5fvGSvtrIjL3rmQbdESnYH5zxqdKeQOIwoPnfvx6uDqqm3HaRBzS+k5V/PkhGsFRR5VFrqA8kPAbE87BYpkqw=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.3.tgz"; + sha512 = "3wmzrwf7tVY8rDRT2jxfQKlKgSB6P8OordFoOxpk1qNP2vmkUN9tWKxaI1ANkdm+et1D3ovUHeSoW6jKscnUAA=="; }; }; - "@graphql-tools/merge-6.2.2" = { + "@graphql-tools/merge-6.2.3" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.2.tgz"; - sha512 = "2YyErSvq4hn5mjE6qJ/0Q8r3WU9JB3+obv2xyvb+oW+E/T1iYRJGxSFldi6lqO5IADZz8QASLJeSpRBw40gpBg=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.3.tgz"; + sha512 = "qSSxdM2AKjnAHuChcnxIfzsGej78B56EE6ZD3tXMtKJOMQMhk4T4yXnKRHEw8fw7ZtNk/KqCmb6LJHy8Ws8frg=="; }; }; - "@graphql-tools/schema-6.2.2" = { + "@graphql-tools/schema-6.2.3" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.2.2.tgz"; - sha512 = "KITlyr//1oKyxIOlGvNZDl4c6bLj2Gc+3eJXyUKWfSmgsmAZPudpQNa/8VbiVujpm7UaX0cyM3FdeCaxWFeBgg=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.2.3.tgz"; + sha512 = "CV5vDfQhXidssLK5hjT55FfwRAvBoGW53lVBl0rbXrbsSX7H9iVHdUf4UaDIlMc6WcnnzOrRiue/khHz3rzDEg=="; }; }; - "@graphql-tools/url-loader-6.2.2" = { + "@graphql-tools/url-loader-6.2.3" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.2.2.tgz"; - sha512 = "vNDjhf7SJr9RnIDPBBEyTfKBb3aWRA3uy3jDkqQ/AFyh4hXRkg8xnECH7c6glRnWiZJeObMTxowZSUnDA68IyA=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.2.3.tgz"; + sha512 = "cV/VR/lT1bHxwhrZlyG+sevl4zU0zZQHS7+TelTfAdKGrSswEozK98pPjkFP57+6ghitH6XoHUE91hFxtaODsA=="; }; }; - "@graphql-tools/utils-6.2.2" = { + "@graphql-tools/utils-6.2.3" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.2.2.tgz"; - sha512 = "a0SSYF76dnKHs8te4Igfnrrq1VOO4sFG8yx3ehO7464eGUfUUYo2QmNRjhxny2HRMvqzX40xuQikyg6LBXDNLQ=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.2.3.tgz"; + sha512 = "eOhZy4y23r6AddokBqvFpQybtHvhTyZCc3VFWn8eIqF92vre90UKHbCX6Cf6VBo6i7l0ZwChPPbUzEiHOk+HJQ=="; }; }; - "@graphql-tools/wrap-6.2.2" = { + "@graphql-tools/wrap-6.2.3" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.2.2.tgz"; - sha512 = "FjCE+NvMwcCiAlt9EAw9uDi2zblE4Z5CEkY+z4NRO1AmCB5THoWJKG+csPh8tGuU80mAJI51Wy9FQGyUo/EU0g=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.2.3.tgz"; + sha512 = "bxMXobcuKy8r7jKefQx5VH3FSyXVHKfDWfJ65Kq4oAC2+d7DUlpr3HZ6BWoMhfgUf6s6PPM26Us00TGsUQlAGg=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -2596,13 +2596,13 @@ let sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A=="; }; }; - "@microsoft/load-themed-styles-1.10.93" = { + "@microsoft/load-themed-styles-1.10.97" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.93"; + version = "1.10.97"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.93.tgz"; - sha512 = "iziiQyDJmyP8QE33hYjuVsj18RvtzRMdON1QLDkJSrs9xisXWgEjK8U12UsEkBYpYXzxPxqq5+X+fK8Vs6g8vQ=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.97.tgz"; + sha512 = "FX8a2rXhYzXJWSoSjbxSyOvOo2SOHUjLG7JRWTf6rwiQDM/8fSTC/7TLkE2BAMg9n4vG+AxrgfN561VPnHQxrw=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -3145,13 +3145,13 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@prettier/plugin-pug-1.5.1" = { + "@prettier/plugin-pug-1.6.1" = { name = "_at_prettier_slash_plugin-pug"; packageName = "@prettier/plugin-pug"; - version = "1.5.1"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-1.5.1.tgz"; - sha512 = "LUuXiILPURVCF8u4gnE6SWQZ/+1kVnRatXK6SmQyk+ed8F4uDyNCGuIu3/W7jYQB+k7kD6eQZqINuPWvbPTzYQ=="; + url = "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-1.6.1.tgz"; + sha512 = "FqFByfSa72q2bxNocGlziXM/wAkhhIG5ecFU6+MddikqWTI+KIoeXRz6QHTtTWjcXqu6svlUNjNLhXMEMh25Hw=="; }; }; "@primer/octicons-10.1.0" = { @@ -3271,13 +3271,13 @@ let sha512 = "9JXf2k8xqvMYfqmhgtB6eCgMN9fbxwF1XDF3mGKJc6pkAmt0jnsqurxQ0tC1akQKNSXCm7c3unQxa3zuxtZ7mQ=="; }; }; - "@rollup/plugin-commonjs-15.0.0" = { + "@rollup/plugin-commonjs-15.1.0" = { name = "_at_rollup_slash_plugin-commonjs"; packageName = "@rollup/plugin-commonjs"; - version = "15.0.0"; + version = "15.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.0.0.tgz"; - sha512 = "8uAdikHqVyrT32w1zB9VhW6uGwGjhKgnDNP4pQJsjdnyF4FgCj6/bmv24c7v2CuKhq32CcyCwRzMPEElaKkn0w=="; + url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.1.0.tgz"; + sha512 = "xCQqz4z/o0h2syQ7d9LskIMvBSH4PX5PjYdpSSvgS+pQik3WahkQVNWg3D8XJeYjZoVWnIUQYDghuEMRGrmQYQ=="; }; }; "@rollup/plugin-json-4.1.0" = { @@ -3442,13 +3442,13 @@ let sha512 = "3guXwRmHOujBy6Lmf7THtnfJQcLRYzpTRpL1rCxLko7OtIWcOth3TvW2JtWNu6qubauA+5kpLB2rdCaPefZYbQ=="; }; }; - "@serverless/platform-client-china-1.0.37" = { + "@serverless/platform-client-china-1.1.0" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "1.0.37"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.37.tgz"; - sha512 = "eN2UBK51Z9RkRY5Im0j2wCl3XuHBKiuY3kpQIxtGs52yuQx8PA0I/HBsYwyRgoTpvATK3MM/SsyeKpvNs90+uw=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.1.0.tgz"; + sha512 = "QVk55zO5wcax3tPFp6IiZwf7yI0wZ64kNuR0eGM31g37AMt2+rBM6plE41zNKADRDBSqOtmnwEbsPiWlxZ/S9A=="; }; }; "@serverless/platform-sdk-2.3.2" = { @@ -10678,13 +10678,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001131" = { + "caniuse-lite-1.0.30001133" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001131"; + version = "1.0.30001133"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001131.tgz"; - sha512 = "4QYi6Mal4MMfQMSqGIRPGbKIbZygeN83QsWq1ixpUwvtfgAZot5BrCKzGygvZaV+CnELdTwD0S4cqUNozq7/Cw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001133.tgz"; + sha512 = "s3XAUFaC/ntDb1O3lcw9K8MPeOW7KO3z9+GzAoBxfz1B0VdacXPMKgFUtG4KIsgmnbexmi013s9miVu4h+qMHw=="; }; }; "canvas-2.6.1" = { @@ -13730,13 +13730,13 @@ let sha512 = "MSHgpjQqgbT/94D4CyADeNoYh52zMkCX4pcJvPP5WqPsLFMKjr2TCMg381ox5qI0ii2dPwaLx/00477knXqXVw=="; }; }; - "cross-fetch-3.0.5" = { + "cross-fetch-3.0.6" = { name = "cross-fetch"; packageName = "cross-fetch"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.5.tgz"; - sha512 = "FFLcLtraisj5eteosnX1gf01qYDCOc4fDy0+euOt8Kn9YBY2NtXL/pCoYPavw24NIQkQqm5ZOLsGD5Zzj0gyew=="; + url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.6.tgz"; + sha512 = "KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ=="; }; }; "cross-spawn-4.0.2" = { @@ -14873,13 +14873,13 @@ let sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; }; - "debug-4.2.0" = { + "debug-4.3.0" = { name = "debug"; packageName = "debug"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"; - sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz"; + sha512 = "jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg=="; }; }; "debug-fabulous-1.1.0" = { @@ -21553,13 +21553,13 @@ let sha512 = "yUhpEDLeuGiGJjRSzEq3kvt4zJtAcjKmhIiwNp/eUs75tRlXfWcHo5tcBaMQtnjHWC7nQYT5HkY/l0QOQTkVww=="; }; }; - "got-11.6.2" = { + "got-11.7.0" = { name = "got"; packageName = "got"; - version = "11.6.2"; + version = "11.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-11.6.2.tgz"; - sha512 = "/21qgUePCeus29Jk7MEti8cgQUNXFSWfIevNIk4H7u1wmXNDrGPKPY6YsPY+o9CIT/a2DjCjRz0x1nM9FtS2/A=="; + url = "https://registry.npmjs.org/got/-/got-11.7.0.tgz"; + sha512 = "7en2XwH2MEqOsrK0xaKhbWibBoZqy+f1RSUoIeF1BLcnf+pyQdDsljWMfmOh+QKJwuvDIiKx38GtPh5wFdGGjg=="; }; }; "got-6.7.1" = { @@ -23750,22 +23750,22 @@ let sha512 = "zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw=="; }; }; - "ink-3.0.5" = { + "ink-3.0.6" = { name = "ink"; packageName = "ink"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/ink/-/ink-3.0.5.tgz"; - sha512 = "Zc/Yoi3P0cY0DC9ryb3HTwmi4Qgke9332ebOhDRaK9Cw6D+ABAOQPeHG8IdmI1GOkMKRMZwTP/1jRs/b1D1n9Q=="; + url = "https://registry.npmjs.org/ink/-/ink-3.0.6.tgz"; + sha512 = "MOaRUKlDdyzBr6IhiBpBA5+9tv+OlVvQrEErQlN2dfofJ0Q52Xc3gZ5YtgGj0UVD24Ex79WL2QZGJh0emz+jDQ=="; }; }; - "ink-text-input-4.0.0" = { + "ink-text-input-4.0.1" = { name = "ink-text-input"; packageName = "ink-text-input"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-4.0.0.tgz"; - sha512 = "mzftl3MRUYEi4/lQQzjUGgmPtPIQgGbeedp6G9cDIGTQPMOiaklrCX8zWi9aY5n0OKoJpjmi3TR6eRBNNhCP8Q=="; + url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-4.0.1.tgz"; + sha512 = "wiqkrB2tgnCnv51r2LpNLVfgrd/V+UXF3ccry+/Q7on9CBt8LVavX6NDYRMdXljuM+CcFV/sVro0bCr5oxB05w=="; }; }; "inline-source-map-0.6.2" = { @@ -31302,13 +31302,13 @@ let sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; - "mobx-4.15.6" = { + "mobx-4.15.7" = { name = "mobx"; packageName = "mobx"; - version = "4.15.6"; + version = "4.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-4.15.6.tgz"; - sha512 = "eZVEHZLi/Fe+V4qurBBQoFHCqaGrfMuYK1Vy4t5MHYfy90f52ptAKsemHsJcYl+R5/sA3oeT3rMLiVsbB7bllA=="; + url = "https://registry.npmjs.org/mobx/-/mobx-4.15.7.tgz"; + sha512 = "X4uQvuf2zYKHVO5kRT5Utmr+J9fDnRgxWWnSqJ4oiccPTQU38YG+/O3nPmOhUy4jeHexl7XJJpWDBgEnEfp+8w=="; }; }; "mobx-react-5.4.4" = { @@ -32256,13 +32256,13 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "nearley-2.19.6" = { + "nearley-2.19.7" = { name = "nearley"; packageName = "nearley"; - version = "2.19.6"; + version = "2.19.7"; src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.19.6.tgz"; - sha512 = "OV3Lx+o5iIGWVY38zs+7aiSnBqaHTFAOQiz83VHJje/wOOaSgzE3H0S/xfISxJhFSoPcX611OEDV9sCT8F283g=="; + url = "https://registry.npmjs.org/nearley/-/nearley-2.19.7.tgz"; + sha512 = "Y+KNwhBPcSJKeyQCFjn8B/MIe+DDlhaaDgjVldhy5xtFewIbiQgcbZV8k2gCVwkI1ZsKCnjIYZbR+0Fim5QYgg=="; }; }; "neat-csv-2.1.0" = { @@ -36786,13 +36786,13 @@ let sha512 = "40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="; }; }; - "polished-3.6.6" = { + "polished-3.6.7" = { name = "polished"; packageName = "polished"; - version = "3.6.6"; + version = "3.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/polished/-/polished-3.6.6.tgz"; - sha512 = "yiB2ims2DZPem0kCD6V0wnhcVGFEhNh0Iw0axNpKU+oSAgFt6yx6HxIT23Qg0WWvgS379cS35zT4AOyZZRzpQQ=="; + url = "https://registry.npmjs.org/polished/-/polished-3.6.7.tgz"; + sha512 = "b4OViUOihwV0icb9PHmWbR+vPqaSzSAEbgLskvb7ANPATVXGiYv/TQFHQo65S53WU9i5EQ1I03YDOJW7K0bmYg=="; }; }; "portfinder-1.0.28" = { @@ -41278,13 +41278,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.27.1" = { + "rollup-2.28.1" = { name = "rollup"; packageName = "rollup"; - version = "2.27.1"; + version = "2.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.27.1.tgz"; - sha512 = "GiWHQvnmMgBktSpY/1+nrGpwPsTw4b9P28og2uedfeq4JZ16rzAmnQ5Pm/E0/BEmDNia1ZbY7+qu3nBgNa19Hg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.28.1.tgz"; + sha512 = "DOtVoqOZt3+FjPJWLU8hDIvBjUylc9s6IZvy76XklxzcLvAQLtVAG/bbhsMhcWnYxC0TKKcf1QQ/tg29zeID0Q=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -50576,13 +50576,13 @@ let sha512 = "JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="; }; }; - "vscode-jsonrpc-5.1.0-next.1" = { + "vscode-jsonrpc-6.0.0-next.5" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "5.1.0-next.1"; + version = "6.0.0-next.5"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.1.0-next.1.tgz"; - sha512 = "mwLDojZkbmpizSJSmp690oa9FB9jig18SIDGZeBCvFc2/LYSRvMm/WwWtMBJuJ1MfFh7rZXfQige4Uje5Z9NzA=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.5.tgz"; + sha512 = "IAgsltQPwg/pXOPsdXgbUTCaO9VSKZwirZN5SGtkdYQ/R3VjeC4v00WTVvoNayWMZpoC3O9u0ogqmsKzKhVasQ=="; }; }; "vscode-languageclient-4.0.1" = { @@ -50594,13 +50594,13 @@ let sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA=="; }; }; - "vscode-languageclient-7.0.0-next.1" = { + "vscode-languageclient-7.0.0-next.9" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; - version = "7.0.0-next.1"; + version = "7.0.0-next.9"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.1.tgz"; - sha512 = "JrjCUhLpQZxQ5VpWpilOHDMhVsn0fdN5jBh1uFNhSr5c2loJvRdr9Km2EuSQOFfOQsBKx0+xvY8PbsypNEcJ6w=="; + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.9.tgz"; + sha512 = "lFO+rN/i72CM2va6iKXq1lD7pJg8J93KEXf0w0boWVqU+DJhWzLrV3pXl8Xk1nCv//qOAyhlc/nx2KZCTeRF/A=="; }; }; "vscode-languageserver-3.5.1" = { @@ -50675,13 +50675,13 @@ let sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw=="; }; }; - "vscode-languageserver-protocol-3.16.0-next.2" = { + "vscode-languageserver-protocol-3.16.0-next.7" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.16.0-next.2"; + version = "3.16.0-next.7"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.2.tgz"; - sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.7.tgz"; + sha512 = "tOjrg+K3RddJ547zpC9/LAgTbzadkPuHlqJFFWIcKjVhiJOh73XyY+Ngcu9wukGaTsuSGjJ0W8rlmwanixa0FQ=="; }; }; "vscode-languageserver-protocol-3.5.1" = { @@ -50738,15 +50738,6 @@ let sha512 = "+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="; }; }; - "vscode-languageserver-types-3.16.0-next.1" = { - name = "vscode-languageserver-types"; - packageName = "vscode-languageserver-types"; - version = "3.16.0-next.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.1.tgz"; - sha512 = "tZFUSbyjUcrh+qQf13ALX4QDdOfDX0cVaBFgy7ktJ0VwS7AW/yRKgGPSxVqqP9OCMNPdqP57O5q47w2pEwfaUg=="; - }; - }; "vscode-languageserver-types-3.16.0-next.2" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -50756,6 +50747,15 @@ let sha512 = "QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q=="; }; }; + "vscode-languageserver-types-3.16.0-next.3" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.16.0-next.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.3.tgz"; + sha512 = "s/z5ZqSe7VpoXJ6JQcvwRiPPA3nG0nAcJ/HH03zoU6QaFfnkcgPK+HshC3WKPPnC2G08xA0iRB6h7kmyBB5Adg=="; + }; + }; "vscode-languageserver-types-3.5.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -52647,13 +52647,13 @@ let sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; }; }; - "yargs-parser-20.0.0" = { + "yargs-parser-20.2.0" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "20.0.0"; + version = "20.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.0.0.tgz"; - sha512 = "8eblPHTL7ZWRkyjIZJjnGf+TijiKJSwA24svzLRVvtgoi/RZiKa9fFQTrlx0OKLnyHSdt/enrdadji6WFfESVA=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.0.tgz"; + sha512 = "2agPoRFPoIcFzOIp6656gcvsg2ohtscpw2OINr/q46+Sq41xz2OYLqx5HRHabmFU1OARIPAYH5uteICE7mn/5A=="; }; }; "yargs-parser-4.2.1" = { @@ -53687,7 +53687,7 @@ in sources."cssstyle-1.4.0" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" sources."domexception-1.0.1" @@ -55132,7 +55132,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001131" + sources."caniuse-lite-1.0.30001133" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -55274,7 +55274,7 @@ in sources."csv-parser-1.12.1" sources."dashdash-1.14.1" sources."date-fns-1.30.1" - (sources."debug-4.2.0" // { + (sources."debug-4.3.0" // { dependencies = [ sources."ms-2.1.2" ]; @@ -56659,7 +56659,7 @@ in sources."commander-2.20.3" sources."concat-map-0.0.1" sources."convert-source-map-1.7.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ejs-2.5.7" sources."ensure-posix-path-1.1.1" sources."escape-string-regexp-1.0.5" @@ -57331,7 +57331,7 @@ in sources."caseless-0.12.0" (sources."castv2-0.1.10" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" ]; }) sources."castv2-client-1.2.0" @@ -57760,10 +57760,10 @@ in coc-eslint = nodeEnv.buildNodePackage { name = "coc-eslint"; packageName = "coc-eslint"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.3.0.tgz"; - sha512 = "V3yyEXLi+XAFPSvA1WiA+qkBytEqLvEsqfwquyZfXkpOAcG4b2PtA+MLou6OFSpJeYpe4d2Xr3sY8ThBCoxx3g=="; + url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.3.1.tgz"; + sha512 = "yiWUByuOtIHs1GnXspO59F5K0QtGYxMmpt8ZC2VvvB3DZZhEbhmBNrcoU66JaJP9y8tCZWTRh1eyobCRBL0pTA=="; }; buildInputs = globalBuildInputs; meta = { @@ -57777,10 +57777,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.0.tgz"; - sha512 = "uGqh7FKFXc26zjuzErw7vtnR8xHxmEf9jJNOekKyYncRg5Wzc7g5kYt2aFo+lA9zk3qC62DJ6LAaDJkfREQDmA=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.1.tgz"; + sha512 = "kPNmgaCx6hKshq/Vv5uugrPkQcDa7pVp+hosGADBP8qzHxudbumDA5va2vSzqjhUxAYEGTL92F0mBapg29pJhg=="; }; buildInputs = globalBuildInputs; meta = { @@ -57856,10 +57856,10 @@ in coc-imselect = nodeEnv.buildNodePackage { name = "coc-imselect"; packageName = "coc-imselect"; - version = "0.0.12"; + version = "0.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/coc-imselect/-/coc-imselect-0.0.12.tgz"; - sha512 = "X8TBe8UTwNd01HrWBXy93jQ1PShGtTa4bm2aH2bQwx9EH9FW7ufRlw7euPKkR2kzilshwb3UbJnLET2vFdZjJw=="; + url = "https://registry.npmjs.org/coc-imselect/-/coc-imselect-0.0.13.tgz"; + sha512 = "5hL7FmrLILl6PwZDUndOfHqfMjAl31pvB6YifmnZJO/ht4J3lFLCWxkiyXt5PRQbrHKLGnPT7sySTKxF8X303g=="; }; buildInputs = globalBuildInputs; meta = { @@ -57980,7 +57980,7 @@ in }) sources."date-format-3.0.0" sources."debounce-1.2.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-extend-0.6.0" sources."define-properties-1.1.3" sources."duplexer2-0.1.4" @@ -58221,7 +58221,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001131" + sources."caniuse-lite-1.0.30001133" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -58288,7 +58288,7 @@ in }) sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."decamelize-keys-1.1.0" sources."decode-uri-component-0.2.0" @@ -59308,7 +59308,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001131" + sources."caniuse-lite-1.0.30001133" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -59348,7 +59348,7 @@ in sources."copy-descriptor-0.1.1" sources."cosmiconfig-5.2.1" sources."currently-unhandled-0.4.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -59934,10 +59934,10 @@ in coc-vetur = nodeEnv.buildNodePackage { name = "coc-vetur"; packageName = "coc-vetur"; - version = "1.1.13"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.13.tgz"; - sha512 = "RVjVqe3CiT+XCSupp8UrUeEGFPLfSrHl4yTxhizqV5SdovxWQ3UOTrDgLvH6HyKiMNphKRhTyknpHyDE6LtdZQ=="; + url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.0.tgz"; + sha512 = "JtuTM6DHU21h6j1fEeAaOtfFveLOzeqVXh9mjd53fVHws9T89wW8yV0ZsU5gz4u4g0tw7nN779sJqOEAXnmR8w=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -59946,7 +59946,7 @@ in sources."@emmetio/extract-abbreviation-0.2.0" (sources."@eslint/eslintrc-0.1.3" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ignore-4.0.6" sources."strip-json-comments-3.1.1" ]; @@ -59959,7 +59959,7 @@ in }) sources."@nodelib/fs.stat-1.1.3" sources."@nodelib/fs.walk-1.2.4" - sources."@prettier/plugin-pug-1.5.1" + sources."@prettier/plugin-pug-1.6.1" sources."@sindresorhus/is-0.14.0" sources."@sorg/log-2.2.0" sources."@starptech/expression-parser-0.10.0" @@ -59997,7 +59997,7 @@ in sources."@typescript-eslint/types-3.10.1" (sources."@typescript-eslint/typescript-estree-3.10.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."semver-7.3.2" ]; }) @@ -60221,7 +60221,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."has-flag-4.0.0" sources."ignore-4.0.6" sources."path-key-3.1.1" @@ -60603,7 +60603,7 @@ in sources."semver-5.7.1" ]; }) - sources."debug-4.2.0" + sources."debug-4.3.0" sources."eslint-6.8.0" sources."eslint-utils-1.4.3" sources."espree-6.2.1" @@ -60941,7 +60941,7 @@ in sources."vscode-web-custom-data-0.3.1" (sources."vue-eslint-parser-7.1.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."espree-6.2.1" ]; }) @@ -62565,7 +62565,7 @@ in sources."dat-secret-storage-4.0.1" sources."dat-storage-1.1.1" sources."dat-swarm-defaults-1.0.2" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decode-uri-component-0.2.0" sources."decompress-response-4.2.1" sources."deep-equal-0.2.2" @@ -63415,7 +63415,7 @@ in sources."convert-to-spaces-1.0.2" sources."cross-spawn-6.0.5" sources."debounce-fn-4.0.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -63445,7 +63445,7 @@ in sources."get-stream-4.1.0" sources."glob-7.1.6" sources."globals-11.12.0" - sources."got-11.6.2" + sources."got-11.7.0" sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" @@ -63455,7 +63455,7 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."ink-3.0.5" // { + (sources."ink-3.0.6" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -63465,7 +63465,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."ink-text-input-4.0.0" // { + (sources."ink-text-input-4.0.1" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -63693,7 +63693,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.93" + sources."@microsoft/load-themed-styles-1.10.97" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -64460,7 +64460,7 @@ in sources."lodash.some-4.6.0" (sources."log4js-6.3.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -64996,7 +64996,7 @@ in (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" sources."ms-2.1.2" @@ -65270,7 +65270,7 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-is-0.1.3" sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" @@ -65414,7 +65414,7 @@ in sources."concat-map-0.0.1" sources."core_d-2.0.0" sources."cross-spawn-7.0.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-is-0.1.3" sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" @@ -66335,7 +66335,7 @@ in }; dependencies = [ sources."async-2.6.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."lodash-4.17.20" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" @@ -66367,7 +66367,7 @@ in sources."chloride-2.3.0" sources."chloride-test-1.2.4" sources."commander-2.20.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-extend-0.6.0" sources."diff-3.5.0" sources."discontinuous-range-1.0.0" @@ -66412,7 +66412,7 @@ in sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.5.0" - sources."nearley-2.19.6" + sources."nearley-2.19.7" sources."node-gyp-build-4.2.3" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" @@ -66560,10 +66560,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "3.2.10"; + version = "3.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.10.tgz"; - sha512 = "IVwhdySPQyHTfImCGllphBqHZtDWGnphjZG4EhkKtJY98b69sbaRU8PRO+XEC0rutbb5Gf0oCHvM3QswtAVCeQ=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.12.tgz"; + sha512 = "ZL27e8s3lkkrKrGCCQDlwIGnLOihrrehDI1jriWaU+UaVME1IYCtOiYbLp59iITK2s8Ak7e0LSSCyO08bRLAvQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -66859,32 +66859,33 @@ in sources."@exodus/schemasafe-1.0.0-rc.2" sources."@graphql-cli/common-4.0.0" sources."@graphql-cli/init-4.0.0" - sources."@graphql-tools/delegate-6.2.2" - (sources."@graphql-tools/graphql-file-loader-6.2.2" // { + sources."@graphql-tools/delegate-6.2.3" + (sources."@graphql-tools/graphql-file-loader-6.2.3" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/import-6.2.2" // { + (sources."@graphql-tools/import-6.2.3" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/json-file-loader-6.2.2" // { + (sources."@graphql-tools/json-file-loader-6.2.3" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - sources."@graphql-tools/load-6.2.2" - sources."@graphql-tools/merge-6.2.2" - sources."@graphql-tools/schema-6.2.2" - (sources."@graphql-tools/url-loader-6.2.2" // { + sources."@graphql-tools/load-6.2.3" + sources."@graphql-tools/merge-6.2.3" + sources."@graphql-tools/schema-6.2.3" + (sources."@graphql-tools/url-loader-6.2.3" // { dependencies = [ - sources."cross-fetch-3.0.5" + sources."cross-fetch-3.0.6" + sources."node-fetch-2.6.1" ]; }) - sources."@graphql-tools/utils-6.2.2" - sources."@graphql-tools/wrap-6.2.2" + sources."@graphql-tools/utils-6.2.3" + sources."@graphql-tools/wrap-6.2.3" sources."@kwsites/exec-p-0.4.0" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -66977,7 +66978,7 @@ in sources."d-1.0.1" sources."dashdash-1.14.1" sources."dataloader-2.0.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."decompress-response-3.3.0" sources."deep-equal-2.0.3" @@ -69027,7 +69028,7 @@ in sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."data-uri-to-buffer-1.2.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-is-0.1.3" sources."degenerator-1.0.4" sources."delayed-stream-1.0.0" @@ -69779,10 +69780,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.0.168"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.0.168.tgz"; - sha512 = "h4ng5Qc2C1RST9cLlVpu+79TpANA9vIEESCv56rzEy0zyhKGtlMeD0IiiY7ZJalmHCousNfYzdTPhM2pg1Q0ug=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.1.7.tgz"; + sha512 = "Eb227112WOzZ4+gMNx4dtGPonyN0c834hdogAfN9yJ30DatlgAi8+kWJI+IuCOznvemu0456+mwHmOhw7jLEPg=="; }; dependencies = [ sources."@cronvel/get-pixels-3.4.0" @@ -70688,10 +70689,10 @@ in jsdoc = nodeEnv.buildNodePackage { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.5"; + version = "3.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.5.tgz"; - sha512 = "SbY+i9ONuxSK35cgVHaI8O9senTE4CDYAmGSDJ5l3+sfe62Ff4gy96osy6OW84t4K4A8iGnMrlRrsSItSNp3RQ=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.6.tgz"; + sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ sources."@babel/parser-7.11.5" @@ -71289,7 +71290,7 @@ in sources."lodash-4.17.20" (sources."log4js-6.3.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -71356,7 +71357,7 @@ in (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -73993,7 +73994,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001131" + sources."caniuse-lite-1.0.30001133" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -74095,7 +74096,7 @@ in sources."dash-ast-1.0.0" sources."dashdash-1.14.1" sources."death-1.1.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."define-properties-1.1.3" @@ -75334,7 +75335,7 @@ in sources."@fluentui/react-icons-0.3.4" sources."@fluentui/react-window-provider-0.3.3" sources."@fluentui/theme-0.3.2" - sources."@microsoft/load-themed-styles-1.10.93" + sources."@microsoft/load-themed-styles-1.10.97" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@uifabric/foundation-7.9.5" @@ -75889,10 +75890,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "2.63.2"; + version = "2.63.3"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.63.2.tgz"; - sha512 = "H9c4UIuhOG5jl7ZlwuB/D4ac35BbYgiwXi77jTwx2QLy5Gy/UfId6ocFAdV5KYwSY5Yx2aS5txt4uYXm5qAb6w=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.63.3.tgz"; + sha512 = "XHokxG0dgSYbewUj9ifRI/EiM8PYAwWaA31+WFCbGHi0kKHrVwFLx1FsQH3Yo35dQk7MM0dnHjT8xTir0slgZw=="; }; dependencies = [ sources."@analytics/cookie-utils-0.2.3" @@ -76188,7 +76189,7 @@ in sources."@octokit/rest-16.43.2" sources."@octokit/types-5.5.0" sources."@rollup/plugin-babel-5.2.1" - (sources."@rollup/plugin-commonjs-15.0.0" // { + (sources."@rollup/plugin-commonjs-15.1.0" // { dependencies = [ sources."estree-walker-2.0.1" ]; @@ -76332,7 +76333,7 @@ in sources."cachedir-2.3.0" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001131" + sources."caniuse-lite-1.0.30001133" sources."cardinal-2.1.1" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -76464,7 +76465,7 @@ in sources."crypto-random-string-2.0.0" sources."cyclist-1.0.1" sources."date-time-2.1.0" - (sources."debug-4.2.0" // { + (sources."debug-4.3.0" // { dependencies = [ sources."ms-2.1.2" ]; @@ -77252,7 +77253,7 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.27.1" + sources."rollup-2.28.1" sources."run-async-2.4.1" sources."run-parallel-1.1.9" sources."rxjs-6.6.3" @@ -78140,7 +78141,7 @@ in sources."accepts-1.3.7" (sources."agent-base-6.0.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -78346,7 +78347,7 @@ in sources."http-signature-1.2.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -79069,7 +79070,7 @@ in sources."core-util-is-1.0.2" sources."crypto-random-string-2.0.0" sources."dashdash-1.14.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."debuglog-1.0.1" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" @@ -79796,7 +79797,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001131" + sources."caniuse-lite-1.0.30001133" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -79879,7 +79880,7 @@ in sources."dashdash-1.14.1" sources."data-urls-1.1.0" sources."deasync-0.1.20" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.3" (sources."defaults-1.0.3" // { @@ -81823,10 +81824,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.6.1"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.6.1.tgz"; - sha512 = "pHEgIV5hIqwaMqDlDNj5yuNuSjN5CKAZvBgdL5CC2mo2itdpqoYy/NkLId0bnnRgrsmyA57Nz4Q78JFnx0Jcdw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.7.0.tgz"; + sha512 = "5+ZKJUKhh6indenG8egpELjgAEQKO6fx5LHlepDr3zymkX6EupySjPh/E/20ue920bUbMdvC0Hi2S71S45IJ7A=="; }; buildInputs = globalBuildInputs; meta = { @@ -82375,10 +82376,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.72"; + version = "1.1.73"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.72.tgz"; - sha512 = "nRYCxhlGwG/NRl6eCZX3oxUaZGy7VRVuL/b46ZsDh69ZzkZ/CSMsxW19Jb4vZgGb8M2eLcFpan45m7UtiHBMWA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.73.tgz"; + sha512 = "IWW7ZCp/Mk0WOVX9o1/L/Usq+vQODEDOaxlLSCDCClBAdjQsxCCo4FYZPMs4Ec3GKRwEmXHwzW8ZIit3J/cHKw=="; }; buildInputs = globalBuildInputs; meta = { @@ -82660,7 +82661,7 @@ in sources."crypto-browserify-3.12.0" sources."css-color-keywords-1.0.0" sources."css-to-react-native-3.0.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."decko-1.2.0" sources."delegate-3.2.0" @@ -82765,7 +82766,7 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-4.15.6" + sources."mobx-4.15.7" sources."mobx-react-5.4.4" sources."ms-2.1.2" sources."neo-async-2.6.2" @@ -82801,7 +82802,7 @@ in sources."pbkdf2-3.1.1" sources."perfect-scrollbar-1.5.0" sources."picomatch-2.2.2" - sources."polished-3.6.6" + sources."polished-3.6.7" sources."postcss-value-parser-4.1.0" sources."prismjs-1.21.0" sources."process-0.11.10" @@ -82974,10 +82975,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.27.1"; + version = "2.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.27.1.tgz"; - sha512 = "GiWHQvnmMgBktSpY/1+nrGpwPsTw4b9P28og2uedfeq4JZ16rzAmnQ5Pm/E0/BEmDNia1ZbY7+qu3nBgNa19Hg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.28.1.tgz"; + sha512 = "DOtVoqOZt3+FjPJWLU8hDIvBjUylc9s6IZvy76XklxzcLvAQLtVAG/bbhsMhcWnYxC0TKKcf1QQ/tg29zeID0Q=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -83084,7 +83085,7 @@ in sources."cross-spawn-7.0.3" sources."css-select-1.2.0" sources."css-what-2.1.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."deep-freeze-0.0.1" sources."deep-is-0.1.3" @@ -83277,7 +83278,7 @@ in sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.27.1" + sources."rollup-2.28.1" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."serialize-javascript-4.0.0" @@ -83328,10 +83329,10 @@ in sources."semver-5.7.1" ]; }) - sources."vscode-jsonrpc-5.1.0-next.1" - sources."vscode-languageclient-7.0.0-next.1" - sources."vscode-languageserver-protocol-3.16.0-next.2" - sources."vscode-languageserver-types-3.16.0-next.1" + sources."vscode-jsonrpc-6.0.0-next.5" + sources."vscode-languageclient-7.0.0-next.9" + sources."vscode-languageserver-protocol-3.16.0-next.7" + sources."vscode-languageserver-types-3.16.0-next.3" sources."vscode-test-1.4.0" sources."which-2.0.2" sources."which-module-2.0.0" @@ -83419,7 +83420,7 @@ in sources."crc-0.2.0" sources."crypto-0.0.3" sources."dashdash-1.14.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."events.node-0.4.9" @@ -83653,7 +83654,7 @@ in sources."2-thenable-1.0.0" (sources."@kwsites/file-exists-1.1.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -83703,7 +83704,7 @@ in ]; }) sources."@serverless/platform-client-1.1.10" - (sources."@serverless/platform-client-china-1.0.37" // { + (sources."@serverless/platform-client-china-1.1.0" // { dependencies = [ sources."archiver-4.0.2" sources."async-3.2.0" @@ -83713,7 +83714,7 @@ in (sources."@serverless/platform-sdk-2.3.2" // { dependencies = [ sources."chalk-2.4.2" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."https-proxy-agent-4.0.0" sources."is-docker-1.1.0" sources."ms-2.1.2" @@ -84079,7 +84080,7 @@ in (sources."https-proxy-agent-5.0.0" // { dependencies = [ sources."agent-base-6.0.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -84294,7 +84295,7 @@ in sources."signal-exit-3.0.3" (sources."simple-git-2.20.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -84344,7 +84345,7 @@ in sources."supports-color-5.5.0" (sources."tabtab-3.0.2" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" sources."untildify-3.0.3" ]; @@ -84412,7 +84413,7 @@ in sources."xtend-4.0.2" sources."yaml-ast-parser-0.0.43" sources."yamljs-0.3.0" - sources."yargs-parser-20.0.0" + sources."yargs-parser-20.2.0" sources."yauzl-2.10.0" sources."yeast-0.1.2" sources."zip-stream-3.0.1" @@ -85181,7 +85182,7 @@ in }) sources."crypto-random-string-2.0.0" sources."data-uri-to-buffer-1.2.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" (sources."decompress-response-6.0.0" // { dependencies = [ @@ -86018,7 +86019,7 @@ in sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."cross-spawn-6.0.5" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decode-uri-component-0.2.0" sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" @@ -86295,7 +86296,7 @@ in }) sources."napi-macros-2.0.0" sources."ncp-2.0.0" - sources."nearley-2.19.6" + sources."nearley-2.19.7" sources."nice-try-1.0.5" sources."node-gyp-build-4.2.3" sources."non-private-ip-1.4.4" @@ -88336,7 +88337,7 @@ in sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" sources."discord.js-11.6.4" @@ -88526,7 +88527,7 @@ in sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."crypt-0.0.2" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-equal-1.1.1" sources."deep-is-0.1.3" sources."define-properties-1.1.3" @@ -88857,7 +88858,7 @@ in sources."core-util-is-1.0.2" sources."crypto-random-string-2.0.0" sources."cuss-1.21.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -89607,7 +89608,7 @@ in sources."after-0.8.2" (sources."agent-base-6.0.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -89771,7 +89772,7 @@ in sources."http_ece-1.1.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -91742,14 +91743,14 @@ in (sources."eslint-5.16.0" // { dependencies = [ sources."cross-spawn-6.0.5" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ignore-4.0.6" ]; }) (sources."eslint-plugin-vue-6.2.2" // { dependencies = [ sources."acorn-7.4.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."eslint-scope-5.1.1" sources."espree-6.2.1" sources."vue-eslint-parser-7.1.0" @@ -92434,7 +92435,7 @@ in sources."vscode-uri-1.0.8" (sources."vue-eslint-parser-6.0.5" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" ]; }) sources."vue-onsenui-helper-json-1.0.2" @@ -92751,7 +92752,7 @@ in (sources."eslint-7.5.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" sources."strip-ansi-6.0.0" ]; @@ -94419,7 +94420,7 @@ in sources."semver-5.7.1" ]; }) - (sources."debug-4.2.0" // { + (sources."debug-4.3.0" // { dependencies = [ sources."ms-2.1.2" ]; @@ -95038,20 +95039,20 @@ in sources."bitfield-3.0.0" (sources."bittorrent-dht-10.0.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) sources."bittorrent-peerid-1.3.3" (sources."bittorrent-protocol-3.1.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) (sources."bittorrent-tracker-9.15.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" sources."ms-2.1.2" @@ -95071,7 +95072,7 @@ in sources."bufferutil-4.0.1" (sources."castv2-0.1.10" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -95216,7 +95217,7 @@ in sources."record-cache-1.1.0" (sources."render-media-3.4.3" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -95232,14 +95233,14 @@ in sources."simple-get-2.8.1" (sources."simple-peer-9.7.2" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) sources."simple-sha1-3.0.1" (sources."simple-websocket-8.1.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -95260,7 +95261,7 @@ in sources."to-arraybuffer-1.0.1" (sources."torrent-discovery-9.3.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -95274,7 +95275,7 @@ in sources."url-join-4.0.1" (sources."ut_metadata-3.5.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -95285,7 +95286,7 @@ in sources."vlc-command-1.2.0" (sources."webtorrent-0.108.6" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decompress-response-4.2.1" sources."mimic-response-2.1.0" sources."ms-2.1.2" @@ -96329,7 +96330,7 @@ in }) (sources."yeoman-generator-4.12.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."diff-4.0.2" sources."dir-glob-2.2.2" sources."ejs-3.1.5" diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index c9c87991a8a..5d66f6e2100 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-08-24"; + rev = "2020-09-21"; version = "unstable-${rev}"; - sha256 = "11q5shrq55krgpj7rjfqw84131j5g55zyrwww3cxcbr8ndi3xdnf"; - cargoSha256 = "15kjcgxmigm0lwbp8p0kdxax86ldjqq9q8ysj6khfhqd0173184n"; + sha256 = "1wjm69r1c6s8a4rd91csg7c48bp8jamxsrm5m6rg3bk2gqp8yzz8"; + cargoSha256 = "089w2i6lvpjxkxghkb2mij9sxfxlcc1zv4iq4qmzq8gnc6ddz12d"; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/pkgs/development/tools/rust/rust-analyzer/generic.nix b/pkgs/development/tools/rust/rust-analyzer/generic.nix index 7092f5291dd..3bd6d1ccee1 100644 --- a/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -1,9 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin -, useJemalloc ? false +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, cmake +, useMimalloc ? false , doCheck ? true # Version specific args -, rev, version, sha256, cargoSha256 }: +, rev, version, sha256, cargoSha256 +}: rustPlatform.buildRustPackage { pname = "rust-analyzer-unwrapped"; @@ -15,11 +16,17 @@ rustPlatform.buildRustPackage { inherit rev sha256; }; + patches = [ + # FIXME: Temporary fix for our rust 1.45.0 since rust-analyzer requires 1.46.0 + ./no-loop-in-const-fn.patch + ./no-option-zip.patch + ]; + buildAndTestSubdir = "crates/rust-analyzer"; - cargoBuildFlags = lib.optional useJemalloc "--features=jemalloc"; + cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc"; - nativeBuildInputs = lib.optionals doCheck [ rustPlatform.rustcSrc ]; + nativeBuildInputs = lib.optional useMimalloc cmake; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; @@ -27,16 +34,11 @@ rustPlatform.buildRustPackage { RUST_ANALYZER_REV = rev; inherit doCheck; - # Skip tests running `rustup` for `cargo fmt`. - preCheck = '' - fakeRustup=$(mktemp -d) - ln -s $(command -v true) $fakeRustup/rustup - export PATH=$PATH''${PATH:+:}$fakeRustup + preCheck = lib.optionalString doCheck '' export RUST_SRC_PATH=${rustPlatform.rustcSrc} ''; - # Temporary disabled until #93119 is fixed. - doInstallCheck = false; + doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck versionOutput="$($out/bin/rust-analyzer --version)" diff --git a/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch b/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch new file mode 100644 index 00000000000..e750b3c4e12 --- /dev/null +++ b/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch @@ -0,0 +1,223 @@ +This patch revert 4b989009e3839cfc6f021d1552a46561cee6cde2 (CONST LOOPS ARE HERE). + +diff --git a/crates/parser/src/grammar/expressions.rs b/crates/parser/src/grammar/expressions.rs +index 5f885edfd..e72929f8c 100644 +--- a/crates/parser/src/grammar/expressions.rs ++++ b/crates/parser/src/grammar/expressions.rs +@@ -316,7 +316,7 @@ fn expr_bp(p: &mut Parser, mut r: Restrictions, bp: u8) -> (Option Option<(CompletedMarker, BlockLike)> { + let m; +diff --git a/crates/parser/src/grammar/expressions/atom.rs b/crates/parser/src/grammar/expressions/atom.rs +index 66a92a4e1..ba6dd2fbc 100644 +--- a/crates/parser/src/grammar/expressions/atom.rs ++++ b/crates/parser/src/grammar/expressions/atom.rs +@@ -15,7 +15,7 @@ use super::*; + // let _ = b"e"; + // let _ = br"f"; + // } +-pub(crate) const LITERAL_FIRST: TokenSet = TokenSet::new(&[ ++pub(crate) const LITERAL_FIRST: TokenSet = token_set![ + TRUE_KW, + FALSE_KW, + INT_NUMBER, +@@ -25,8 +25,8 @@ pub(crate) const LITERAL_FIRST: TokenSet = TokenSet::new(&[ + STRING, + RAW_STRING, + BYTE_STRING, +- RAW_BYTE_STRING, +-]); ++ RAW_BYTE_STRING ++]; + + pub(crate) fn literal(p: &mut Parser) -> Option { + if !p.at_ts(LITERAL_FIRST) { +@@ -39,7 +39,7 @@ pub(crate) fn literal(p: &mut Parser) -> Option { + + // E.g. for after the break in `if break {}`, this should not match + pub(super) const ATOM_EXPR_FIRST: TokenSet = +- LITERAL_FIRST.union(paths::PATH_FIRST).union(TokenSet::new(&[ ++ LITERAL_FIRST.union(paths::PATH_FIRST).union(token_set![ + T!['('], + T!['{'], + T!['['], +@@ -59,9 +59,9 @@ pub(super) const ATOM_EXPR_FIRST: TokenSet = + T![loop], + T![for], + LIFETIME, +- ])); ++ ]); + +-const EXPR_RECOVERY_SET: TokenSet = TokenSet::new(&[LET_KW, R_DOLLAR]); ++const EXPR_RECOVERY_SET: TokenSet = token_set![LET_KW, R_DOLLAR]; + + pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMarker, BlockLike)> { + if let Some(m) = literal(p) { +diff --git a/crates/parser/src/grammar/items.rs b/crates/parser/src/grammar/items.rs +index 22810e6fb..8fd8f3b80 100644 +--- a/crates/parser/src/grammar/items.rs ++++ b/crates/parser/src/grammar/items.rs +@@ -26,7 +26,7 @@ pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) { + } + } + +-pub(super) const ITEM_RECOVERY_SET: TokenSet = TokenSet::new(&[ ++pub(super) const ITEM_RECOVERY_SET: TokenSet = token_set![ + FN_KW, + STRUCT_KW, + ENUM_KW, +@@ -41,7 +41,7 @@ pub(super) const ITEM_RECOVERY_SET: TokenSet = TokenSet::new(&[ + USE_KW, + MACRO_KW, + T![;], +-]); ++]; + + pub(super) fn item_or_macro(p: &mut Parser, stop_on_r_curly: bool) { + let m = p.start(); +diff --git a/crates/parser/src/grammar/paths.rs b/crates/parser/src/grammar/paths.rs +index 5d297e2d6..52562afa4 100644 +--- a/crates/parser/src/grammar/paths.rs ++++ b/crates/parser/src/grammar/paths.rs +@@ -3,7 +3,7 @@ + use super::*; + + pub(super) const PATH_FIRST: TokenSet = +- TokenSet::new(&[IDENT, T![self], T![super], T![crate], T![:], T![<]]); ++ token_set![IDENT, T![self], T![super], T![crate], T![:], T![<]]; + + pub(super) fn is_path_start(p: &Parser) -> bool { + is_use_path_start(p) || p.at(T![<]) +diff --git a/crates/parser/src/grammar/patterns.rs b/crates/parser/src/grammar/patterns.rs +index 796f206e1..07b1d6dd5 100644 +--- a/crates/parser/src/grammar/patterns.rs ++++ b/crates/parser/src/grammar/patterns.rs +@@ -2,18 +2,9 @@ + + use super::*; + +-pub(super) const PATTERN_FIRST: TokenSet = +- expressions::LITERAL_FIRST.union(paths::PATH_FIRST).union(TokenSet::new(&[ +- T![box], +- T![ref], +- T![mut], +- T!['('], +- T!['['], +- T![&], +- T![_], +- T![-], +- T![.], +- ])); ++pub(super) const PATTERN_FIRST: TokenSet = expressions::LITERAL_FIRST ++ .union(paths::PATH_FIRST) ++ .union(token_set![T![box], T![ref], T![mut], T!['('], T!['['], T![&], T![_], T![-], T![.]]); + + pub(crate) fn pattern(p: &mut Parser) { + pattern_r(p, PAT_RECOVERY_SET); +@@ -83,7 +74,7 @@ fn pattern_single_r(p: &mut Parser, recovery_set: TokenSet) { + } + + const PAT_RECOVERY_SET: TokenSet = +- TokenSet::new(&[LET_KW, IF_KW, WHILE_KW, LOOP_KW, MATCH_KW, R_PAREN, COMMA]); ++ token_set![LET_KW, IF_KW, WHILE_KW, LOOP_KW, MATCH_KW, R_PAREN, COMMA]; + + fn atom_pat(p: &mut Parser, recovery_set: TokenSet) -> Option { + let m = match p.nth(0) { +diff --git a/crates/parser/src/grammar/types.rs b/crates/parser/src/grammar/types.rs +index 1ea130ac5..9d00eb9b9 100644 +--- a/crates/parser/src/grammar/types.rs ++++ b/crates/parser/src/grammar/types.rs +@@ -2,7 +2,7 @@ + + use super::*; + +-pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(TokenSet::new(&[ ++pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(token_set![ + T!['('], + T!['['], + T![<], +@@ -16,16 +16,16 @@ pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(TokenSet::new(&[ + T![for], + T![impl], + T![dyn], +-])); ++]); + +-const TYPE_RECOVERY_SET: TokenSet = TokenSet::new(&[ ++const TYPE_RECOVERY_SET: TokenSet = token_set![ + T![')'], + T![,], + L_DOLLAR, + // test_err struct_field_recover + // struct S { f pub g: () } + T![pub], +-]); ++]; + + pub(crate) fn type_(p: &mut Parser) { + type_with_bounds_cond(p, true); +diff --git a/crates/parser/src/token_set.rs b/crates/parser/src/token_set.rs +index a68f0144e..994017acf 100644 +--- a/crates/parser/src/token_set.rs ++++ b/crates/parser/src/token_set.rs +@@ -9,21 +9,15 @@ pub(crate) struct TokenSet(u128); + impl TokenSet { + pub(crate) const EMPTY: TokenSet = TokenSet(0); + +- pub(crate) const fn new(kinds: &[SyntaxKind]) -> TokenSet { +- let mut res = 0u128; +- let mut i = 0; +- while i < kinds.len() { +- res |= mask(kinds[i]); +- i += 1 +- } +- TokenSet(res) ++ pub(crate) const fn singleton(kind: SyntaxKind) -> TokenSet { ++ TokenSet(mask(kind)) + } + + pub(crate) const fn union(self, other: TokenSet) -> TokenSet { + TokenSet(self.0 | other.0) + } + +- pub(crate) const fn contains(&self, kind: SyntaxKind) -> bool { ++ pub(crate) fn contains(&self, kind: SyntaxKind) -> bool { + self.0 & mask(kind) != 0 + } + } +@@ -32,10 +26,16 @@ const fn mask(kind: SyntaxKind) -> u128 { + 1u128 << (kind as usize) + } + ++#[macro_export] ++macro_rules! token_set { ++ ($($t:expr),*) => { TokenSet::EMPTY$(.union(TokenSet::singleton($t)))* }; ++ ($($t:expr),* ,) => { token_set!($($t),*) }; ++} ++ + #[test] + fn token_set_works_for_tokens() { + use crate::SyntaxKind::*; +- let ts = TokenSet::new(&[EOF, SHEBANG]); ++ let ts = token_set![EOF, SHEBANG]; + assert!(ts.contains(EOF)); + assert!(ts.contains(SHEBANG)); + assert!(!ts.contains(PLUS)); +diff --git a/xtask/src/install.rs b/xtask/src/install.rs +index d829790d7..b25a6e301 100644 +--- a/xtask/src/install.rs ++++ b/xtask/src/install.rs +@@ -7,7 +7,7 @@ use anyhow::{bail, format_err, Context, Result}; + use crate::not_bash::{pushd, run}; + + // Latest stable, feel free to send a PR if this lags behind. +-const REQUIRED_RUST_VERSION: u32 = 46; ++const REQUIRED_RUST_VERSION: u32 = 43; + + pub struct InstallCmd { + pub client: Option, diff --git a/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch b/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch new file mode 100644 index 00000000000..06c8a1a595e --- /dev/null +++ b/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch @@ -0,0 +1,63 @@ +diff --git a/crates/assists/src/handlers/merge_imports.rs b/crates/assists/src/handlers/merge_imports.rs +index 0bd679260..e0b76e079 100644 +--- a/crates/assists/src/handlers/merge_imports.rs ++++ b/crates/assists/src/handlers/merge_imports.rs +@@ -32,7 +32,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<() + if let Some(use_item) = tree.syntax().parent().and_then(ast::Use::cast) { + let (merged, to_delete) = + next_prev().filter_map(|dir| neighbor(&use_item, dir)).find_map(|use_item2| { +- try_merge_imports(&use_item, &use_item2, MergeBehaviour::Full).zip(Some(use_item2)) ++ Some((try_merge_imports(&use_item, &use_item2, MergeBehaviour::Full)?, use_item2)) + })?; + + rewriter.replace_ast(&use_item, &merged); +@@ -44,7 +44,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<() + } else { + let (merged, to_delete) = + next_prev().filter_map(|dir| neighbor(&tree, dir)).find_map(|use_tree| { +- try_merge_trees(&tree, &use_tree, MergeBehaviour::Full).zip(Some(use_tree)) ++ Some((try_merge_trees(&tree, &use_tree, MergeBehaviour::Full)?, use_tree)) + })?; + + rewriter.replace_ast(&tree, &merged); +diff --git a/crates/assists/src/utils/insert_use.rs b/crates/assists/src/utils/insert_use.rs +index 6d110aaaf..1f1838729 100644 +--- a/crates/assists/src/utils/insert_use.rs ++++ b/crates/assists/src/utils/insert_use.rs +@@ -223,7 +223,7 @@ fn common_prefix(lhs: &ast::Path, rhs: &ast::Path) -> Option<(ast::Path, ast::Pa + } + res = Some((lhs_curr.clone(), rhs_curr.clone())); + +- match lhs_curr.parent_path().zip(rhs_curr.parent_path()) { ++ match zip(lhs_curr.parent_path(), rhs_curr.parent_path()) { + Some((lhs, rhs)) => { + lhs_curr = lhs; + rhs_curr = rhs; +@@ -309,8 +309,8 @@ fn find_insert_position( + let path_node_iter = scope + .as_syntax_node() + .children() +- .filter_map(|node| ast::Use::cast(node.clone()).zip(Some(node))) +- .flat_map(|(use_, node)| use_.use_tree().and_then(|tree| tree.path()).zip(Some(node))); ++ .filter_map(|node| zip(ast::Use::cast(node.clone()), Some(node))) ++ .flat_map(|(use_, node)| zip(use_.use_tree().and_then(|tree| tree.path()), Some(node))); + // Iterator that discards anything thats not in the required grouping + // This implementation allows the user to rearrange their import groups as this only takes the first group that fits + let group_iter = path_node_iter +@@ -328,7 +328,7 @@ fn find_insert_position( + segments + .clone() + .zip(check_segments) +- .flat_map(|(seg, seg2)| seg.name_ref().zip(seg2.name_ref())) ++ .flat_map(|(seg, seg2)| zip(seg.name_ref(), seg2.name_ref())) + .all(|(l, r)| l.text() <= r.text()) + }); + match post_insert { +@@ -743,3 +743,7 @@ use foo::bar::baz::Qux;", + check(path, ra_fixture_before, ra_fixture_after, None) + } + } ++ ++fn zip(x: Option, y: Option) -> Option<(T, U)> { ++ Some((x?, y?)) ++} diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index ac2da521c22..4af15f4619e 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -2,25 +2,25 @@ "name": "rust-analyzer", "version": "0.4.0-dev", "dependencies": { - "node-fetch": "^2.6.0", - "vscode-languageclient": "7.0.0-next.1", - "@rollup/plugin-commonjs": "^13.0.0", - "@rollup/plugin-node-resolve": "^8.1.0", - "@types/glob": "^7.1.2", + "node-fetch": "^2.6.1", + "vscode-languageclient": "7.0.0-next.9", + "@rollup/plugin-commonjs": "^13.0.2", + "@rollup/plugin-node-resolve": "^8.4.0", + "@types/glob": "^7.1.3", "@types/mocha": "^7.0.2", "@types/node": "~12.7.0", "@types/node-fetch": "^2.5.7", - "@types/vscode": "^1.44.1", - "@typescript-eslint/eslint-plugin": "^3.4.0", - "@typescript-eslint/parser": "^3.4.0", - "eslint": "^7.3.1", + "@types/vscode": "^1.47.1", + "@typescript-eslint/eslint-plugin": "^3.10.1", + "@typescript-eslint/parser": "^3.10.1", + "eslint": "^7.8.0", "glob": "^7.1.6", - "mocha": "^8.0.1", - "rollup": "^2.18.1", - "tslib": "^2.0.0", - "typescript": "^3.9.5", + "mocha": "^8.1.3", + "rollup": "^2.26.9", + "tslib": "^2.0.1", + "typescript": "^3.9.7", "typescript-formatter": "^7.2.2", - "vsce": "^1.75.0", + "vsce": "^1.79.5", "vscode-test": "^1.4.0" } }