Personal-use NixOS configuration

Update NetworkOptimizer

+74 -97
+6 -2
packages/network-optimizer/default.nix
··· 8 8 9 9 buildDotnetModule rec { 10 10 pname = "network-optimizer"; 11 - version = "1.1.9"; 11 + version = "1.11.5"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "Ozark-Connect"; 15 15 repo = "NetworkOptimizer"; 16 16 tag = "v${version}"; 17 - hash = "sha256-G13GjR5R+f80sCjxKx/3uZmEbURoN69xrM5DFc/SilY="; 17 + hash = "sha256-d7htjw7gozUnnqzmuDlg5Ala828nJ9zeBZsf3EFxbm4="; 18 18 }; 19 19 20 20 nugetDeps = ./deps.json; ··· 26 26 27 27 dotnetBuildFlags = [ 28 28 "-p:OverridePackageVersion=${version}" 29 + ]; 30 + 31 + patches = [ 32 + ./ignore_local_packages.patch 29 33 ]; 30 34 31 35 buildPhase = ''
+55 -95
packages/network-optimizer/deps.json
··· 1 1 [ 2 2 { 3 - "pname": "BouncyCastle.Cryptography", 4 - "version": "2.6.2", 5 - "hash": "sha256-Yjk2+x/RcVeccGOQOQcRKCiYzyx1mlFnhS5auCII+Ms=" 3 + "pname": "Blazor-ApexCharts", 4 + "version": "6.1.0", 5 + "hash": "sha256-T7XTW6YsNR6pE99YwG+ff4tTDt87+GVwDq3DPboeAck=" 6 6 }, 7 7 { 8 - "pname": "Castle.Core", 9 - "version": "5.1.1", 10 - "hash": "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE=" 8 + "pname": "BouncyCastle.Cryptography", 9 + "version": "2.5.1", 10 + "hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c=" 11 11 }, 12 12 { 13 - "pname": "coverlet.collector", 14 - "version": "6.0.4", 15 - "hash": "sha256-ieiUl7G5pVKQ4V6rxhEe0ehep0/u1RBD3EAI63AQTI0=" 13 + "pname": "BouncyCastle.Cryptography", 14 + "version": "2.6.2", 15 + "hash": "sha256-Yjk2+x/RcVeccGOQOQcRKCiYzyx1mlFnhS5auCII+Ms=" 16 16 }, 17 17 { 18 18 "pname": "CsvHelper", ··· 20 20 "hash": "sha256-4MwA/WerpI0VYWiaEudNCNnE1v6/k2tPmLbRjmgijV4=" 21 21 }, 22 22 { 23 - "pname": "FluentAssertions", 24 - "version": "8.8.0", 25 - "hash": "sha256-LpYD0QthKjuZO3JrtxE3K+dAGwzc48BTdhWlBzfOLgs=" 26 - }, 27 - { 28 23 "pname": "Humanizer.Core", 29 24 "version": "2.14.1", 30 25 "hash": "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o=" ··· 50 45 "hash": "sha256-x5XsC5gd77JPwYe0ViuVh71DxGc++XdqngmVJ1w9cHo=" 51 46 }, 52 47 { 53 - "pname": "Microsoft.AspNetCore.App.Internal.Assets", 54 - "version": "10.0.0", 55 - "hash": "sha256-IyY5Ymdkmf9S9qRwYXX9rWpzcU3fuDR+ITeaaeJQ/Dk=" 48 + "pname": "MailKit", 49 + "version": "4.12.0", 50 + "hash": "sha256-kRSeIvgXBeYGIsXYfb26K7MSXRrOI0tkMeLLzJzrNMQ=" 51 + }, 52 + { 53 + "pname": "MaxMind.Db", 54 + "version": "4.1.0", 55 + "hash": "sha256-cwYlgi7U7EN7g+WHv4Jmh16VUQvqqTUgHWCAIa+Z/Z4=" 56 + }, 57 + { 58 + "pname": "MaxMind.GeoIP2", 59 + "version": "5.2.0", 60 + "hash": "sha256-iuYNc0+MVS3JCL6ZZf72baG4ToaBohDLRSB3KNIx+sk=" 56 61 }, 57 62 { 58 63 "pname": "Microsoft.AspNetCore.Authentication.JwtBearer", ··· 125 130 "hash": "sha256-5SJfpRqzqCK0UbkmAaJpA/r1XJb0YAriMMeQHYC4d+o=" 126 131 }, 127 132 { 128 - "pname": "Microsoft.CodeCoverage", 129 - "version": "18.0.1", 130 - "hash": "sha256-G6y5iyHZ3R2shlLCW/uTusio/UqcnWT79X+UAbxvDQY=" 131 - }, 132 - { 133 133 "pname": "Microsoft.Data.Sqlite", 134 134 "version": "10.0.1", 135 135 "hash": "sha256-Lnu5Yq2y4T+AOt/UU7CHPFxN3+ctWODbPRgbb7ZBIgI=" ··· 160 160 "hash": "sha256-GGNZIGNEMhSGaMRFkRN4bOuCUBs5YVnX8klXarm319U=" 161 161 }, 162 162 { 163 - "pname": "Microsoft.EntityFrameworkCore.InMemory", 164 - "version": "10.0.1", 165 - "hash": "sha256-YOYWSaOoxGoA7mCM60mM3SsUjOYVXQ1a3GAnK+Y9xMM=" 166 - }, 167 - { 168 163 "pname": "Microsoft.EntityFrameworkCore.Relational", 169 164 "version": "10.0.1", 170 165 "hash": "sha256-zLgxr/iW9HP8Fip1IDgr7X0Ar8OWKDvVmoEt65gG6VY=" ··· 245 240 "hash": "sha256-tEt6VaaDR7bICKHiCp0l2Cmz8u+FCYORLVNAaJymGM8=" 246 241 }, 247 242 { 243 + "pname": "Microsoft.Extensions.FileProviders.Abstractions", 244 + "version": "10.0.1", 245 + "hash": "sha256-IYtaZ5nssj9RPHL+DODXt9Z2IvTtj8rKuLQuyoMqo+w=" 246 + }, 247 + { 248 + "pname": "Microsoft.Extensions.Hosting.Abstractions", 249 + "version": "10.0.1", 250 + "hash": "sha256-2t+yF23Ac9MvytZK8hym+aUYynuAFZVdKdcRVvVsdXo=" 251 + }, 252 + { 248 253 "pname": "Microsoft.Extensions.Hosting.WindowsServices", 249 254 "version": "10.0.0", 250 255 "hash": "sha256-UXfyhYk8D/Yos1eXmHiHNDtjdU0vYVug/7ePiIkQCp4=" ··· 270 275 "hash": "sha256-NRk0feNE1fgi/hyO0AVDbSGJQRT+9yte6Lpm4Hz/2Bs=" 271 276 }, 272 277 { 273 - "pname": "Microsoft.Extensions.Logging.Abstractions", 274 - "version": "8.0.3", 275 - "hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q=" 276 - }, 277 - { 278 278 "pname": "Microsoft.Extensions.Logging.Configuration", 279 279 "version": "10.0.1", 280 280 "hash": "sha256-/7ywcFsEmmQzWEcIvxoGAYHF0oDSXV/LTDAiW/MNQtg=" ··· 296 296 }, 297 297 { 298 298 "pname": "Microsoft.Extensions.Options", 299 + "version": "8.0.0", 300 + "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw=" 301 + }, 302 + { 303 + "pname": "Microsoft.Extensions.Options", 299 304 "version": "9.0.0", 300 305 "hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck=" 301 306 }, ··· 313 318 "pname": "Microsoft.Extensions.Primitives", 314 319 "version": "2.2.0", 315 320 "hash": "sha256-DMCTC3HW+sHaRlh/9F1sDwof+XgvVp9IzAqzlZWByn4=" 321 + }, 322 + { 323 + "pname": "Microsoft.Extensions.Primitives", 324 + "version": "8.0.0", 325 + "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo=" 316 326 }, 317 327 { 318 328 "pname": "Microsoft.Extensions.Primitives", ··· 365 375 "hash": "sha256-hQE07TCgcQuyu9ZHVq2gPDb0+xe8ECJUdrgh17bJP4o=" 366 376 }, 367 377 { 368 - "pname": "Microsoft.NET.Test.Sdk", 369 - "version": "18.0.1", 370 - "hash": "sha256-0c3/rp9di0w7E5UmfRh6Prrm3Aeyi8NOj5bm2i6jAh0=" 371 - }, 372 - { 373 - "pname": "Microsoft.TestPlatform.ObjectModel", 374 - "version": "18.0.1", 375 - "hash": "sha256-oJbS7SZ46RzyOQ+gCysW7qJRy7V8RlQVa5d8uajb91M=" 376 - }, 377 - { 378 - "pname": "Microsoft.TestPlatform.TestHost", 379 - "version": "18.0.1", 380 - "hash": "sha256-OXYf5vg4piDr10ve0bZ2ZSb+nb3yOiHayJV3cu5sMV4=" 378 + "pname": "MimeKit", 379 + "version": "4.12.0", 380 + "hash": "sha256-4i/RvXyXQsb6LlEs7tZWz5d5ab8mw3R8Wwp7FXSbMaA=" 381 381 }, 382 382 { 383 383 "pname": "MinVer", ··· 390 390 "hash": "sha256-VlgGDvgNZb7MeBbIZ4DE2Nn/j2aD9k6XqNHnASUSDr0=" 391 391 }, 392 392 { 393 - "pname": "Moq", 394 - "version": "4.20.72", 395 - "hash": "sha256-+uAc/6xtzij9YnmZrhZwc+4vUgx6cppZsWQli3CGQ8o=" 396 - }, 397 - { 398 393 "pname": "Newtonsoft.Json", 399 394 "version": "13.0.1", 400 395 "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" ··· 448 443 "pname": "RestSharp", 449 444 "version": "112.0.0", 450 445 "hash": "sha256-p0H29uL5M6JqSdhCcNcU5Pvz+rrZd+tmcGycXioZVhk=" 446 + }, 447 + { 448 + "pname": "Scriban", 449 + "version": "5.12.0", 450 + "hash": "sha256-1KLlzSbx+BGbx69v/N8PlXnm+kbyBoqcPwhZM0lQG3M=" 451 451 }, 452 452 { 453 453 "pname": "Scriban", ··· 596 596 }, 597 597 { 598 598 "pname": "System.Diagnostics.EventLog", 599 - "version": "6.0.0", 600 - "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM=" 601 - }, 602 - { 603 - "pname": "System.Diagnostics.EventLog", 604 599 "version": "8.0.0", 605 600 "hash": "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y=" 606 601 }, ··· 646 641 }, 647 642 { 648 643 "pname": "System.Security.Cryptography.Pkcs", 644 + "version": "8.0.1", 645 + "hash": "sha256-KMNIkJ3yQ/5O6WIhPjyAIarsvIMhkp26A6aby5KkneU=" 646 + }, 647 + { 648 + "pname": "System.Security.Cryptography.Pkcs", 649 649 "version": "9.0.0", 650 650 "hash": "sha256-AjG14mGeSc2Ka4QSelGBM1LrGBW3VJX60lnihKyJjGY=" 651 651 }, ··· 688 688 "pname": "System.Windows.Extensions", 689 689 "version": "9.0.0", 690 690 "hash": "sha256-RErD+Ju15qtnwdwB7E0SjjJGAnhXwJyC7UPcl24Z3Vs=" 691 - }, 692 - { 693 - "pname": "xunit", 694 - "version": "2.9.3", 695 - "hash": "sha256-BPrpSbjlIB7PoH+ocCusqMDrMZgRQZSzeTeJzHK/I9c=" 696 - }, 697 - { 698 - "pname": "xunit.abstractions", 699 - "version": "2.0.3", 700 - "hash": "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM=" 701 - }, 702 - { 703 - "pname": "xunit.analyzers", 704 - "version": "1.18.0", 705 - "hash": "sha256-DOgamLnfi9Ua5IDm3JVm9MaOFbSSbmq5l8j2NPO3qd0=" 706 - }, 707 - { 708 - "pname": "xunit.assert", 709 - "version": "2.9.3", 710 - "hash": "sha256-vHYOde8bd10pOmr7iTAYNtPlqHzsJl4x3t1DDuYdDCA=" 711 - }, 712 - { 713 - "pname": "xunit.core", 714 - "version": "2.9.3", 715 - "hash": "sha256-qkVQ8Jw/LZWmxirkPOwiry7bvZn3IuaRzu/sp2H8anw=" 716 - }, 717 - { 718 - "pname": "xunit.extensibility.core", 719 - "version": "2.9.3", 720 - "hash": "sha256-mcpVX+m0R7F0ev9CaBnbai9gtu4GVcqijEuRqe89D0g=" 721 - }, 722 - { 723 - "pname": "xunit.extensibility.execution", 724 - "version": "2.9.3", 725 - "hash": "sha256-2rxMs2Dt4cAcmOFMwP5Yd3RpP0BnmiL8cXlKysXY0jw=" 726 - }, 727 - { 728 - "pname": "xunit.runner.visualstudio", 729 - "version": "3.1.5", 730 - "hash": "sha256-O5657884QGldszsEWQFCDRTXViFBmZ4GGC+4iU+usSQ=" 731 691 } 732 692 ]
+13
packages/network-optimizer/ignore_local_packages.patch
··· 1 + diff --git a/src/NetworkOptimizer.Web/NetworkOptimizer.Web.csproj b/src/NetworkOptimizer.Web/NetworkOptimizer.Web.csproj 2 + index 74ecfdc9..2101a1f5 100644 3 + --- a/src/NetworkOptimizer.Web/NetworkOptimizer.Web.csproj 4 + +++ b/src/NetworkOptimizer.Web/NetworkOptimizer.Web.csproj 5 + @@ -24,7 +24,7 @@ 6 + </ItemGroup> 7 + 8 + <ItemGroup> 9 + - <PackageReference Include="Blazor-ApexCharts" Version="6.1.1-ozarkconnect.2" /> 10 + + <PackageReference Include="Blazor-ApexCharts" Version="6.1.0" /> 11 + <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.1" /> 12 + <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.0" /> 13 + <PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />