From eb817e62232d4605f054a399e263428d9b345c37 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 17 Dec 2024 17:30:36 -0500 Subject: [PATCH 1/2] Fix nix versioning --- build/package/nix/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/package/nix/package.nix b/build/package/nix/package.nix index 7d04f757a4..848ebe91f8 100644 --- a/build/package/nix/package.nix +++ b/build/package/nix/package.nix @@ -29,10 +29,11 @@ let xmlstarlet sel -N X="http://schemas.microsoft.com/developer/msbuild/2003" --template --value-of /X:Project/X:PropertyGroup/X:TgsCoreVersion ./Version.props > $out/tgs_version.txt ''; }; + version = (builtins.readFile "${versionParse}/tgs_version.txt"); fixedOutput = stdenv.mkDerivation { pname = "tgstation-server-release-server-console-zip"; - version = (builtins.readFile "${versionParse}/tgs_version.txt"); + inherit version; meta = with pkgs.lib; { description = "Host watchdog binaries for tgstation-server"; @@ -99,7 +100,7 @@ stdenv.mkDerivation { mkdir -p $out/bin unzip "${fixedOutput}/ServerConsole.zip" -d $out/bin rm -rf $out/bin/lib - makeWrapper ${pkgs.dotnetCorePackages.sdk_8_0}/dotnet $out/bin/tgstation-server --suffix PATH : ${ + makeWrapper ${pkgs.dotnetCorePackages.sdk_8_0}/bin/dotnet $out/bin/tgstation-server --suffix PATH : ${ lib.makeBinPath ( with pkgs; [ From bd5b721045c86633e37aea9bf22dc3425596837f Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Wed, 18 Dec 2024 19:24:33 -0500 Subject: [PATCH 2/2] Version bump to 6.12.1 --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index 8209b0f18a..b52824d914 100644 --- a/build/Version.props +++ b/build/Version.props @@ -3,7 +3,7 @@ - 6.12.0 + 6.12.1 5.4.0 10.12.0 0.5.0