From 2fd0efd7cbe703c95954cea8c89ce91497f65e0d Mon Sep 17 00:00:00 2001 From: oxalica Date: Mon, 23 Nov 2020 20:41:06 +0800 Subject: [PATCH] osu-lazer: 2020.1017.0 -> 2020.1121.0 --- pkgs/games/osu-lazer/default.nix | 4 +- pkgs/games/osu-lazer/deps.nix | 177 ++++++++++++++++++++++++++----- 2 files changed, 153 insertions(+), 28 deletions(-) diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 9cd6475d1274..88f0c6abfc56 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2020.1017.0"; + version = "2020.1121.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "0sz3l8cxi9vlryjd7cb86dh3gcanim2pvhag3cg5sslqzrrinp2v"; + sha256 = "54AP3NZv5Nov3CAJoxn5E5tO9HhtlEY36x8OHAV8YVE="; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index eb9fa617d5be..42e5969dfc4a 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -281,8 +281,53 @@ }) (fetchNuGet { name = "Markdig"; - version = "0.21.1"; - sha256 = "119v22rvg51ifg54r1ndf2bw7hv1lf5wn3cd04ccg8d7r8c0yhbk"; + version = "0.22.0"; + sha256 = "0k7v4xlhfgyca8bb1g85062m22skmk6ay0hcyqlpi2cnvy7f61qf"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Connections.Abstractions"; + version = "3.1.9"; + sha256 = "0vsnc87fqh61mjl2zgv7nfx6wkrg055cq12ql6cxmcawv6qsl0lw"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Http.Connections.Client"; + version = "3.1.9"; + sha256 = "1m5w8pmm4bn7w1ml2xcs43kfr2hkicch46zr616ml8j6fsks6wmw"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Http.Connections.Common"; + version = "3.1.9"; + sha256 = "0ppzxfgnhn0jpn0rg72gcwb0hcjk1qbzpzk9aiykp8vnfvqlmb20"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.Http.Features"; + version = "3.1.9"; + sha256 = "0xg0psas8k38yfd72q7m5sm00yyxj51j1fqg473za2kxf8z4p2wx"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.SignalR.Client"; + version = "3.1.9"; + sha256 = "1yn5y3b51jcpw7szj3pfz79hk84kmypy465cm22khh5z34wy41jx"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.SignalR.Client.Core"; + version = "3.1.9"; + sha256 = "0ld7hch240z7zc7ckrppd4yrwwdhx3nbc8fgf4qql8ld8bih223y"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.SignalR.Common"; + version = "3.1.9"; + sha256 = "1kvp8y3fnhvfm7fpg1qsymwzch7jcfc9337zybwryfyzxjxq7aaj"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.SignalR.Protocols.Json"; + version = "3.1.9"; + sha256 = "1gp6wjidhbbpibnam2fimm3pc5p70wv17zhis5qf6an49xvlmmmb"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; + version = "3.1.9"; + sha256 = "1hdmsfk5ymp2vi4saxiw19j83ykvz5jzv0f4060cgc8bafndakrr"; }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; @@ -306,8 +351,8 @@ }) (fetchNuGet { name = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; - version = "3.3.0"; - sha256 = "04z03ir9sal5h9ha97isbh660jijslb8zfiaa48w2r2l6pabz5kd"; + version = "3.3.1"; + sha256 = "0xh23x91xg8qwfam70wsn039sn5li0pkay36lds9dl15p1vbfasm"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Common"; @@ -326,13 +371,13 @@ }) (fetchNuGet { name = "Microsoft.CodeAnalysis.FxCopAnalyzers"; - version = "3.0.0"; - sha256 = "0a17vb6jnj6kch70d7vki84728hlc3zpffsbv533yji6kf6x6d24"; + version = "3.3.1"; + sha256 = "0wkrxymb9si2v0rzqnr8mdi89fi7swd1vbbclccjp8645ha1nif0"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.VersionCheckAnalyzer"; - version = "3.0.0"; - sha256 = "11g3hj3p885zj7bn99qzh68m1xifbwzrgmx1pkvpi10rmgkpyh8j"; + version = "3.3.1"; + sha256 = "010fadvngp21yz1b4vk0bbx79p5yr6nji19w56ma9zp1hj7fn2y1"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Workspaces.Common"; @@ -346,8 +391,8 @@ }) (fetchNuGet { name = "Microsoft.CodeQuality.Analyzers"; - version = "3.0.0"; - sha256 = "1x3yf21m41w2iv9nlwp03q6byqgivd48h2dlm5vgv5bd53xjfz77"; + version = "3.3.1"; + sha256 = "1ng91xf3shjl74xvckygh9aqccwqapia46gilddkb5kiqj847bik"; }) (fetchNuGet { name = "Microsoft.CSharp"; @@ -371,8 +416,8 @@ }) (fetchNuGet { name = "Microsoft.Diagnostics.Runtime"; - version = "2.0.145301"; - sha256 = "02gzyal13ilqdxzzdzdavw85xk4z8zp88waanr7b72zxhm0fzfj9"; + version = "2.0.151903"; + sha256 = "1y7hsgzjs6b3323fcq5km515knykfgvdx4x8l1g03sy5h3lwwhak"; }) (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; @@ -429,26 +474,51 @@ version = "2.2.0"; sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration"; + version = "3.1.9"; + sha256 = "01ci8nhv3ki93aa7a3vh9icl3jav7ikizq43kcgdjgsssi6xvdf9"; + }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.2.0"; sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Abstractions"; + version = "3.1.9"; + sha256 = "0skilj4gfzyn05mn74w2q4jp1ww2wwbsxw2i7v8bwk73nymsqpr8"; + }) (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "2.2.0"; sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Configuration.Binder"; + version = "3.1.9"; + sha256 = "1n8fndd9vrd3d7041p42li8v129mgl3gi8sl1x8whhycy0ahqr78"; + }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection"; + version = "3.1.9"; + sha256 = "1ifjjzwfvd5igxaaxm124qv8afs1nb06rgdqy7l3jcfqr30xykbb"; + }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; }) + (fetchNuGet { + name = "Microsoft.Extensions.DependencyInjection.Abstractions"; + version = "3.1.9"; + sha256 = "1l7ng71y18fwdlyq2ycl12hmv9wrf7k7knz2jwv9w9w7spmp8jv6"; + }) (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; @@ -459,26 +529,46 @@ version = "2.2.0"; sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging"; + version = "3.1.9"; + sha256 = "1x1bbkcq7ph9jgwv3yidipfqwdh6q3bsa2rxhfzmy64l7hc7r1wl"; + }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "2.2.0"; sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Logging.Abstractions"; + version = "3.1.9"; + sha256 = "1i24mz3v677bmdysxklm9a3qc87j72lpkfp0l16gh6yqpmhwg7vp"; + }) (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; - version = "3.1.8"; - sha256 = "00il5z4pwysii0di9lxx7a2hc9ca64rrvw3zvzfi4wgf05xm66ff"; + version = "3.1.9"; + sha256 = "1gq1i7rb50dzj9hp07q0w9siyqy3hl0zqpk8na37s4jq6ikb5q82"; }) (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "2.2.0"; sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Options"; + version = "3.1.9"; + sha256 = "0rpix172cmwwbddh4gm0647x1ql0ly5n68bpz71v915j97anwg90"; + }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; }) + (fetchNuGet { + name = "Microsoft.Extensions.Primitives"; + version = "3.1.9"; + sha256 = "0538fvjz9c27nvc6kv83b0912qvc71wz2w60svl0mscj86ds49wc"; + }) (fetchNuGet { name = "Microsoft.Net.Compilers.Toolset"; version = "3.1.0"; @@ -486,8 +576,8 @@ }) (fetchNuGet { name = "Microsoft.NetCore.Analyzers"; - version = "3.0.0"; - sha256 = "0b8biyw7nymqfbg08g2vmpf1xm6g1mm6hz4gjxc5f3g72kd2nswj"; + version = "3.3.1"; + sha256 = "16cx0x5hcjs2ml5zjalfsp7n3rfyz75ihnvh1p10z96yaz43gdwn"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; @@ -526,8 +616,8 @@ }) (fetchNuGet { name = "Microsoft.NetFramework.Analyzers"; - version = "3.0.0"; - sha256 = "09dqizym3bca4281714yxrhhgryxpjhjfjnyfswlhyh42qi3ix2k"; + version = "3.3.1"; + sha256 = "06vjmjmqhrmfc57ndsc8jaybc8np06s797nhg40bf44603bx6159"; }) (fetchNuGet { name = "Microsoft.Win32.Primitives"; @@ -586,8 +676,8 @@ }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2020.1009.0"; - sha256 = "0mqx9wjp639k56f0cjlrk67mq7c4h4vlglvss93dnvbb20ljn54r"; + version = "2020.1120.0"; + sha256 = "13vm6qly09f9b9bnf8r4wkypbxz673x852fjllj33sz55qh6957m"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -596,8 +686,8 @@ }) (fetchNuGet { name = "ppy.osu.Game.Resources"; - version = "2020.1016.0"; - sha256 = "1zsqmmlxbb2ncrlvha33cz0inbd6ijbcvxn0y0cysfkg7zb9iisy"; + version = "2020.1030.0"; + sha256 = "1sxip1m5y7c5jblf9br8f0i5yhv0qjpidv9w6bbdxiy29mfwnz6d"; }) (fetchNuGet { name = "ppy.osuTK.NS20"; @@ -606,8 +696,8 @@ }) (fetchNuGet { name = "ppy.SDL2-CS"; - version = "1.0.15"; - sha256 = "0qld7sp7y7hwwxsdxc8m17nyb2zwfxym63j50icvf0rlawmrl7ca"; + version = "1.0.40"; + sha256 = "1pvc154nqdbhn0rm6id0710yh72wvd2s5xmqxx3935h1jxrjgk8s"; }) (fetchNuGet { name = "ppy.squirrel.windows"; @@ -796,8 +886,8 @@ }) (fetchNuGet { name = "StbiSharp"; - version = "1.0.12"; - sha256 = "044lyc6522s8q4kgvly0rsxghkiv4dwzycl2ibxf7q5dvws02qvp"; + version = "1.0.13"; + sha256 = "0yaspwlh4x93d7xnqj5w5pxlwzlv9lixvksyvdh176krfa4mjw3q"; }) (fetchNuGet { name = "System.AppContext"; @@ -1054,6 +1144,11 @@ version = "4.7.0"; sha256 = "1vivvf158ilcpp6bq70zyafimi0lng546b34csmjb09k19wgxpiv"; }) + (fetchNuGet { + name = "System.IO.Pipelines"; + version = "4.7.3"; + sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy"; + }) (fetchNuGet { name = "System.Linq"; version = "4.1.0"; @@ -1084,6 +1179,11 @@ version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.2"; + sha256 = "1g24dwqfcmf4gpbgbhaw1j49xmpsz389l6bw2xxbsmnzvsf860ld"; + }) (fetchNuGet { name = "System.Memory"; version = "4.5.3"; @@ -1259,6 +1359,11 @@ version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.5.3"; + sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; + }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; @@ -1434,6 +1539,16 @@ version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { + name = "System.Text.Encodings.Web"; + version = "4.7.1"; + sha256 = "1wj7r07mjwbf9a79kapy2l9m8mcq8b3nbhg0zaprlsav09k85fmb"; + }) + (fetchNuGet { + name = "System.Text.Json"; + version = "4.7.2"; + sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; + }) (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.1.0"; @@ -1454,6 +1569,11 @@ version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { + name = "System.Threading.Channels"; + version = "4.7.1"; + sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2"; + }) (fetchNuGet { name = "System.Threading.Tasks"; version = "4.0.11"; @@ -1479,6 +1599,11 @@ version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.5.4"; + sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; + }) (fetchNuGet { name = "System.Threading.Thread"; version = "4.0.0";