From c846589af3b49ee0b1cefabcac26065ace6e70ad Mon Sep 17 00:00:00 2001 From: hissssst Date: Wed, 15 Oct 2025 22:29:36 +0200 Subject: [PATCH] Update flake --- flake.lock | 8 +- flake.nix | 2 +- nix/README.md | 13 ++++ nix/deps.json | 199 +++++++++++++++++++++++++++++++++++------------- nix/package.nix | 4 +- 5 files changed, 167 insertions(+), 59 deletions(-) create mode 100644 nix/README.md diff --git a/flake.lock b/flake.lock index f8f7ca93..32869060 100644 --- a/flake.lock +++ b/flake.lock @@ -18,16 +18,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756829923, - "narHash": "sha256-bi71yCPOC1EDMFW3s4J/i987Nqse1iWlmvwqfbqZmvI=", + "lastModified": 1760504863, + "narHash": "sha256-h13YFQMi91nXkkRoJMIfezorz5SbD6849jw5L0fjK4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a8f5ff5d858c6fc9ec9db02e73f7843ad3adfddb", + "rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-25.05", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 0ef031e7..e1db7f27 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Flake providing a package for the Space Station 14 Launcher."; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-25.05"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; inputs.flake-compat = { url = "github:edolstra/flake-compat"; flake = false; diff --git a/nix/README.md b/nix/README.md new file mode 100644 index 00000000..0d364b9b --- /dev/null +++ b/nix/README.md @@ -0,0 +1,13 @@ +# How to update + +1. Setup `nix` + +2. Change the version and hash in `nix/package.nix` + +3. In the root of the project call the `nix run .#fetch-deps nix/deps.json` + +4. Test it out with `nix build .` + +5. Profit + +6. ??? diff --git a/nix/deps.json b/nix/deps.json index 5dee9fb6..c92c779d 100644 --- a/nix/deps.json +++ b/nix/deps.json @@ -41,8 +41,8 @@ }, { "pname": "Avalonia.Markup.Xaml.Loader", - "version": "11.2.4", - "hash": "sha256-iSf5UmeWi6D7uVblYj3eMN9pljwKA6O0pAz1UYE38kQ=" + "version": "11.0.0", + "hash": "sha256-ZpKpPjPOhJWUiUinuR+Zvo/BSr86b5WpUqIunON1zns=" }, { "pname": "Avalonia.Native", @@ -99,6 +99,11 @@ "version": "6.6.4", "hash": "sha256-Xe9sGzIdQ970f0RwxD3KhdfqvGUoTpim2u2oqYHkDcI=" }, + { + "pname": "Fody", + "version": "6.9.2", + "hash": "sha256-rQAVA3ybnZhbX/n5QaMEg0qbM2fKTOHcLLr84CQt1G0=" + }, { "pname": "HarfBuzzSharp", "version": "7.3.0.3", @@ -126,13 +131,23 @@ }, { "pname": "HotAvalonia", - "version": "2.1.0", - "hash": "sha256-dAsVw79exJeQBCCMwJDv7SWARl3dcSIEYcjcmusLqJM=" + "version": "3.0.0", + "hash": "sha256-Y4XM1tvillcGh7Xa5ilDVIr7Inyod3fXPtu+d/LEay8=" + }, + { + "pname": "HotAvalonia.Core", + "version": "3.0.0", + "hash": "sha256-4yICwumuV1DenqjiJ6B4ULE++c6JWHcQSfdLXoNH618=" }, { "pname": "HotAvalonia.Extensions", - "version": "2.1.0", - "hash": "sha256-96H37VvKh2E42KNXtUClhvArcJeX6/diooD2HEcNbOY=" + "version": "3.0.0", + "hash": "sha256-nnn2uHkul8+73FtR3qpYA3knITG8TFKOWixmuFGAprM=" + }, + { + "pname": "HotAvalonia.Fody", + "version": "3.0.0", + "hash": "sha256-5lLLAakzPRc8HKnabMmp7Vg9zfxHxzYgR926IPeFH0A=" }, { "pname": "JetBrains.Annotations", @@ -141,8 +156,8 @@ }, { "pname": "libsodium", - "version": "1.0.18.2", - "hash": "sha256-gjaW2AYXQSb3LLjtQDjWSxkTmEiqIoIb7NFx0+AlrQs=" + "version": "1.0.20.1", + "hash": "sha256-wd/z31FRbcaVGrogSNVjefEYWjNxTGzQd04DOlY1PFE=" }, { "pname": "Linguini.Bundle", @@ -174,50 +189,30 @@ "version": "8.0.0", "hash": "sha256-BAbtucZQvBgbiJ51UAL/Ilx+dz96LpWmfjnnNGlcw48=" }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, { "pname": "Microsoft.Toolkit.Mvvm", "version": "7.1.2", "hash": "sha256-JOxZGQGm1WPkIpIDurQnlYk+QgHxJLPguJfCQLJ8NEM=" }, - { - "pname": "Mono.Cecil", - "version": "0.11.5", - "hash": "sha256-nPFwbzW08gnCjadBdgi+16MHYhsPAXnFIliveLxGaNA=" - }, { "pname": "Mono.Posix.NETStandard", "version": "1.0.0", "hash": "sha256-/F61k7MY/fu2FcfW7CkyjuUroKwlYAXPQFVeDs1QknY=" }, - { - "pname": "MonoMod.Backports", - "version": "1.1.2", - "hash": "sha256-oXhcnMo0rDZDcpmhGVhQhax0lFeb9DT3GfSooesOo38=" - }, - { - "pname": "MonoMod.Core", - "version": "1.2.1", - "hash": "sha256-EQ4CX9OGxBPMDqMCdrudkGY/ywZUi3rtFszDcgp7MBg=" - }, - { - "pname": "MonoMod.ILHelpers", - "version": "1.1.0", - "hash": "sha256-seoET5fqsyOY8g7DfNpLQHNTdUVY3U/xCoYFC4UrOKw=" - }, - { - "pname": "MonoMod.RuntimeDetour", - "version": "25.2.1", - "hash": "sha256-ZlgzMqquKWwv8+MvOhIEdvoPShFe7nUAZ3evWhGoLsc=" - }, - { - "pname": "MonoMod.Utils", - "version": "25.0.7", - "hash": "sha256-GegA6fMRLYVeB75ypkIfTdqgGT38fcKqY/McqZE27qQ=" - }, { "pname": "NSec.Cryptography", - "version": "22.4.0", - "hash": "sha256-TVB8MDXan3dQphaYG/rLQMWgpYJ6WE5ORiqiQrfnCW0=" + "version": "25.4.0", + "hash": "sha256-jwsuS+Kp+sD31S41tTHv/zkFqnzxnGOEty2iZVmBb6E=" }, { "pname": "ReactiveUI", @@ -231,8 +226,8 @@ }, { "pname": "Robust.Natives", - "version": "0.1.1", - "hash": "sha256-/DPbgIzIqZx7ClHKSgI88p03xwKSNWY/MqNri2ZX7uo=" + "version": "0.2.3", + "hash": "sha256-EwaSVnPsDSjY61vBIHaRSs/xpigGPqRStjYLcz+xaB0=" }, { "pname": "Robust.Natives.Angle", @@ -241,34 +236,84 @@ }, { "pname": "Robust.Natives.Fluidsynth", - "version": "0.1.0", - "hash": "sha256-XRyvRqEcEFFvXSjcvNRl9MIMAY42nWRrC7pHqQvn0wI=" + "version": "0.2.1-fluidsynth2.4.6", + "hash": "sha256-M5YcA5vwSABOz39WMy35wEiZ0Qkmtv6Om/tveYH67dA=" }, { "pname": "Robust.Natives.Freetype", - "version": "0.1.0", - "hash": "sha256-gufHmxKub3204pAYvcLegY80LMoKPY5u3Z3uIleReWo=" + "version": "0.2.1-freetype2.13.3", + "hash": "sha256-kSh5XbkYZm6QygkVZ3AyXbw7/57rPpXBLgvSGgBjHrs=" }, { "pname": "Robust.Natives.Glfw", - "version": "0.1.0", - "hash": "sha256-YDL7w5wVb2Il/O4PRlxPgYUOlM2Ksu+kIrlKc1qYynU=" + "version": "0.2.1", + "hash": "sha256-aT3hgPrrgoiwrysTWluE57siQ8WF/wH9BLcTErORJgE=" }, { "pname": "Robust.Natives.OpenAL", - "version": "0.1.0", - "hash": "sha256-3dIpRKPASi8wu8eMWSC/M4CNJK1WKKJVB4XVXKSeihs=" + "version": "0.2.1-openal1.24.3", + "hash": "sha256-YTv/uWovpVTF9/IM0IvAlIO0bZxt91MV7DtynJmXSYM=" + }, + { + "pname": "Robust.Natives.Sdl3", + "version": "0.1.1-sdl3.2.20", + "hash": "sha256-dQPO/zME+e/Hsmic32hn5YIy4+LKfjDk064o6N7PKvM=" }, { "pname": "Robust.Natives.Swnfd", "version": "0.1.0", "hash": "sha256-Qav0yDVQ30eV31Gz+oMXJvHQnP+XrOicakw4rb6hVus=" }, + { + "pname": "Robust.Natives.Zstd", + "version": "0.1.1-zstd1.5.7", + "hash": "sha256-3Na821HUgGmqley8eBY/fZ1rM62Kr8fVE8Dg4h1LIwk=" + }, { "pname": "Robust.Shared.AuthLib", "version": "0.1.2", "hash": "sha256-ANaf6S0tsocsw37RJvk9d4LcvVQ0+1yO900iG1BLwe4=" }, + { + "pname": "runtime.any.System.IO", + "version": "4.3.0", + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" + }, + { + "pname": "runtime.any.System.Reflection", + "version": "4.3.0", + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" + }, + { + "pname": "runtime.any.System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.any.System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, { "pname": "Serilog", "version": "2.12.0", @@ -354,6 +399,11 @@ "version": "5.0.0", "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg=" }, + { + "pname": "System.IO", + "version": "4.3.0", + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + }, { "pname": "System.IO.Pipelines", "version": "8.0.0", @@ -374,6 +424,11 @@ "version": "8.0.0", "hash": "sha256-wSK5KtWvlDp8WLNddCmAM66uGyj9/KfJyCh8ht1PD1M=" }, + { + "pname": "System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" + }, { "pname": "System.Reactive", "version": "6.0.0", @@ -384,10 +439,50 @@ "version": "6.0.1", "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" }, + { + "pname": "System.Reflection", + "version": "4.3.0", + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" + }, + { + "pname": "System.Reflection.Emit", + "version": "4.3.0", + "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" + }, + { + "pname": "System.Reflection.Emit.ILGeneration", + "version": "4.3.0", + "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "9.0.3", + "hash": "sha256-57O/tttsJHnDr/1+gVkv+qmfncoXxP0s2i5U0dYEma0=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" + }, + { + "pname": "System.Runtime", + "version": "4.3.0", + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" + }, { "pname": "TerraFX.Interop.Windows", - "version": "10.0.22621.1", - "hash": "sha256-0golrteOhpZblYuKjM3YP2rswAv/hzWDQ6I9rT9TcWE=" + "version": "10.0.26100.2", + "hash": "sha256-dIyetiPHgFg3cXN620ur3O/O3c+7Piw+KKzr88SlpHw=" }, { "pname": "Tmds.DBus.Protocol", diff --git a/nix/package.nix b/nix/package.nix index a3c62d1a..4f279e20 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -36,7 +36,7 @@ soundfont-path ? "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2", }: let - version = "0.33.0"; + version = "0.35.0"; pname = "space-station-14-launcher"; in buildDotnetModule rec { @@ -50,7 +50,7 @@ buildDotnetModule rec { owner = "space-wizards"; repo = "SS14.Launcher"; rev = "v${version}"; - hash = "sha256-mEockP4fcNFP0h1j30cV2Czq751xjjpdaqQ0Wxe0+7M="; + hash = "sha256-8YDlX5GwL5S/gdjIWOa48sEGA/sMEYZvy2FTWSPO+Ug="; fetchSubmodules = true; };