From 32d09a7f4a8f330c241912be884001be7c870bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 13 Dec 2024 20:36:07 +0100 Subject: [PATCH 1/4] vrcadvert: add version checking --- pkgs/by-name/vr/vrcadvert/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/vr/vrcadvert/package.nix b/pkgs/by-name/vr/vrcadvert/package.nix index 006f5f7cb97f..c331ad47f68f 100644 --- a/pkgs/by-name/vr/vrcadvert/package.nix +++ b/pkgs/by-name/vr/vrcadvert/package.nix @@ -3,6 +3,7 @@ dotnetCorePackages, fetchFromGitHub, lib, + versionCheckHook, }: buildDotnetModule rec { @@ -22,6 +23,12 @@ buildDotnetModule rec { executables = [ "VrcAdvert" ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/VrcAdvert"; + meta = { description = "Advertise your OSC app through OSCQuery"; homepage = "https://github.com/galister/VrcAdvert"; From 58c0be8a93a9092e8314c10d754cd51ecd6cbedd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 13 Dec 2024 20:39:19 +0100 Subject: [PATCH 2/4] vrcadvert: add update script --- pkgs/by-name/vr/vrcadvert/package.nix | 2 ++ pkgs/by-name/vr/vrcadvert/update.sh | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100755 pkgs/by-name/vr/vrcadvert/update.sh diff --git a/pkgs/by-name/vr/vrcadvert/package.nix b/pkgs/by-name/vr/vrcadvert/package.nix index c331ad47f68f..3870aad0d857 100644 --- a/pkgs/by-name/vr/vrcadvert/package.nix +++ b/pkgs/by-name/vr/vrcadvert/package.nix @@ -29,6 +29,8 @@ buildDotnetModule rec { ]; versionCheckProgram = "${placeholder "out"}/bin/VrcAdvert"; + passthru.updateScript = ./update.sh; + meta = { description = "Advertise your OSC app through OSCQuery"; homepage = "https://github.com/galister/VrcAdvert"; diff --git a/pkgs/by-name/vr/vrcadvert/update.sh b/pkgs/by-name/vr/vrcadvert/update.sh new file mode 100755 index 000000000000..874b5bb8e525 --- /dev/null +++ b/pkgs/by-name/vr/vrcadvert/update.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env nix-shell +#!nix-shell --pure -i bash -p bash nix nix-update git cacert +set -eo pipefail + +prev_version=$(nix eval --raw -f. vrcadvert.version) +nix-update vrcadvert +[[ $(nix eval --raw -f. vrcadvert.version) == "$prev_version" ]] || + $(nix-build . -A vrcadvert.fetch-deps --no-out-link) From 3ff58f5e65c6a0eed2315d0b2bac3f85cec6de6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 13 Dec 2024 20:41:21 +0100 Subject: [PATCH 3/4] vrcadvert: refactor --- pkgs/by-name/vr/vrcadvert/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vr/vrcadvert/package.nix b/pkgs/by-name/vr/vrcadvert/package.nix index 3870aad0d857..cac7a9d85fd3 100644 --- a/pkgs/by-name/vr/vrcadvert/package.nix +++ b/pkgs/by-name/vr/vrcadvert/package.nix @@ -7,13 +7,13 @@ }: buildDotnetModule rec { - pname = "VrcAdvert"; + pname = "vrcadvert"; version = "1.0.0"; src = fetchFromGitHub { owner = "galister"; repo = "VrcAdvert"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-noIu5LV0yva94Kmdr39zb0kKXDaIrQ8DIplCj3aTIbQ="; }; From 4674410ccdead236b94e6bf25aabb7dcdf1746a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 13 Dec 2024 20:54:11 +0100 Subject: [PATCH 4/4] vrcadvert: .NET 6 -> .NET 8 --- pkgs/by-name/vr/vrcadvert/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/vr/vrcadvert/package.nix b/pkgs/by-name/vr/vrcadvert/package.nix index cac7a9d85fd3..29939130f190 100644 --- a/pkgs/by-name/vr/vrcadvert/package.nix +++ b/pkgs/by-name/vr/vrcadvert/package.nix @@ -17,12 +17,21 @@ buildDotnetModule rec { hash = "sha256-noIu5LV0yva94Kmdr39zb0kKXDaIrQ8DIplCj3aTIbQ="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + dotnetFlags = [ "-p:RuntimeFrameworkVersion=${dotnet-runtime.version}" ]; nugetDeps = ./deps.nix; executables = [ "VrcAdvert" ]; + postPatch = '' + substituteInPlace VrcAdvert.csproj \ + --replace-fail 'net6.0' 'net8.0' + substituteInPlace global.json \ + --replace-fail '6.0.0' '8.0.0' + ''; + doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook