From a040d1d1225582314214a48c2828290adebb37c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 18 Dec 2024 18:09:41 +0100 Subject: [PATCH 1/6] opentabletdriver: simpler update script --- pkgs/by-name/op/opentabletdriver/update.sh | 27 +++++----------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/op/opentabletdriver/update.sh b/pkgs/by-name/op/opentabletdriver/update.sh index 24f6ec1ffbc4..61eac4b8b5da 100755 --- a/pkgs/by-name/op/opentabletdriver/update.sh +++ b/pkgs/by-name/op/opentabletdriver/update.sh @@ -1,23 +1,8 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq common-updater-scripts nixfmt-rfc-style -set -eo pipefail +#!nix-shell --pure -i bash -p bash nix nix-update git cacert +set -euo pipefail -verlte() { - printf '%s\n' "$1" "$2" | sort -C -V -} - -new_version="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/OpenTabletDriver/OpenTabletDriver/releases" | - jq -r 'map(select(.prerelease == false)) | .[0].tag_name' | - cut -c2-)" -old_version="$(nix --extra-experimental-features 'nix-command' eval --file default.nix opentabletdriver.version --raw)" - -if verlte "$new_version" "$old_version"; then - echo "Already up to date!" - [[ "${1}" != "--force" ]] && exit 0 -fi - -update-source-version opentabletdriver "$new_version" -eval "$(nix-build -A opentabletdriver.fetch-deps --no-out-link)" - -cd "$(dirname "${BASH_SOURCE[0]}")" -nixfmt deps.nix +prev_version=$(nix eval --raw -f. opentabletdriver.version) +nix-update opentabletdriver +[[ $(nix eval --raw -f. opentabletdriver.version) == "$prev_version" ]] || + "$(nix-build . -A opentabletdriver.fetch-deps --no-out-link)" From b1f3b76f521e0b319fe000a28e052f17f0bd33b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 19 Dec 2024 00:26:05 +0100 Subject: [PATCH 2/6] opentabletdriver: update disabledTests --- pkgs/by-name/op/opentabletdriver/package.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix index 7293028faa14..08b5641265d2 100644 --- a/pkgs/by-name/op/opentabletdriver/package.nix +++ b/pkgs/by-name/op/opentabletdriver/package.nix @@ -70,17 +70,14 @@ buildDotnetModule rec { testProjectFile = "OpenTabletDriver.Tests/OpenTabletDriver.Tests.csproj"; disabledTests = [ - # Require networking - "OpenTabletDriver.Tests.PluginRepositoryTest.ExpandRepositoryTarballFork" - "OpenTabletDriver.Tests.PluginRepositoryTest.ExpandRepositoryTarball" # Require networking & unused in Linux build - "OpenTabletDriver.Tests.UpdaterTests.UpdaterBase_ProperlyChecks_Version_Async" - "OpenTabletDriver.Tests.UpdaterTests.Updater_PreventsUpdate_WhenAlreadyUpToDate_Async" - "OpenTabletDriver.Tests.UpdaterTests.Updater_AllowsReupdate_WhenInstallFailed_Async" - "OpenTabletDriver.Tests.UpdaterTests.Updater_HasUpdateReturnsFalse_During_UpdateInstall_Async" - "OpenTabletDriver.Tests.UpdaterTests.Updater_HasUpdateReturnsFalse_After_UpdateInstall_Async" - "OpenTabletDriver.Tests.UpdaterTests.Updater_Prevents_ConcurrentAndConsecutive_Updates_Async" - "OpenTabletDriver.Tests.UpdaterTests.Updater_ProperlyBackups_BinAndAppDataDirectory_Async" + "OpenTabletDriver.Tests.UpdaterTests.CheckForUpdates_Returns_Update_When_Available" + "OpenTabletDriver.Tests.UpdaterTests.Install_Throws_UpdateAlreadyInstalledException_When_AlreadyInstalled" + "OpenTabletDriver.Tests.UpdaterTests.Install_DoesNotThrow_UpdateAlreadyInstalledException_When_PreviousInstallFailed" + "OpenTabletDriver.Tests.UpdaterTests.Install_Throws_UpdateInProgressException_When_AnotherUpdate_Is_InProgress" + "OpenTabletDriver.Tests.UpdaterTests.Install_Moves_UpdatedBinaries_To_BinDirectory" + "OpenTabletDriver.Tests.UpdaterTests.Install_Moves_Only_ToBeUpdated_Binaries" + "OpenTabletDriver.Tests.UpdaterTests.Install_Copies_AppDataFiles" # Intended only to be run in continuous integration, unnecessary for functionality "OpenTabletDriver.Tests.ConfigurationTest.Configurations_DeviceIdentifier_IsNotConflicting" # Depends on processor load From 34e0981ede3ea626ca5c8ed7159d8186938c2426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 18 Dec 2024 23:44:11 +0100 Subject: [PATCH 3/6] opentabletdriver: 0.6.4.0-unstable-2024-11-25 -> 0.6.5.0 --- pkgs/by-name/op/opentabletdriver/deps.json | 5 +++++ pkgs/by-name/op/opentabletdriver/package.nix | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/op/opentabletdriver/deps.json b/pkgs/by-name/op/opentabletdriver/deps.json index 89827461a22f..3a9322d5d7fb 100644 --- a/pkgs/by-name/op/opentabletdriver/deps.json +++ b/pkgs/by-name/op/opentabletdriver/deps.json @@ -19,6 +19,11 @@ "version": "3.0.2", "hash": "sha256-b8LCEIZCLJdYcJXQqI3TGDmkLrmLhz84eoTq+qP5xvU=" }, + { + "pname": "DiffPlex", + "version": "1.7.2", + "hash": "sha256-Vsn81duAmPIPkR40h5bEz7hgtF5Kt5nAAGhQZrQbqxE=" + }, { "pname": "Eto.Forms", "version": "2.5.10", diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix index 08b5641265d2..34fe197a39f8 100644 --- a/pkgs/by-name/op/opentabletdriver/package.nix +++ b/pkgs/by-name/op/opentabletdriver/package.nix @@ -20,19 +20,16 @@ buildDotnetModule rec { pname = "OpenTabletDriver"; - version = "0.6.4.0-unstable-2024-11-25"; + version = "0.6.5.0"; src = fetchFromGitHub { owner = "OpenTabletDriver"; repo = "OpenTabletDriver"; - rev = "8b88b8bdc5144391f10eb61ee77803ba0ee83718"; # 0.6.x branch - hash = "sha256-5JKkSqV9owkHgWXfjiyv5QRh86apDCPzpA6qha1i4D4="; + rev = "refs/tags/v${version}"; + hash = "sha256-ILnwHfcV/tW59TLDpAeDwJK708IQfMFBOYuqRtED0kw="; }; - dotnetInstallFlags = [ "--framework=net8.0" ]; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; projectFile = [ "OpenTabletDriver.Console" From 212370d7553108a9786c2c3e701dedac3f542c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 20 Dec 2024 12:59:59 +0100 Subject: [PATCH 4/6] opentabletdriver: add changelog --- pkgs/by-name/op/opentabletdriver/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix index 34fe197a39f8..05a432facfe2 100644 --- a/pkgs/by-name/op/opentabletdriver/package.nix +++ b/pkgs/by-name/op/opentabletdriver/package.nix @@ -122,9 +122,11 @@ buildDotnetModule rec { }; meta = { + changelog = "https://github.com/OpenTabletDriver/OpenTabletDriver/releases/tag/v${version}"; description = "Open source, cross-platform, user-mode tablet driver"; homepage = "https://github.com/OpenTabletDriver/OpenTabletDriver"; license = lib.licenses.lgpl3Plus; + mainProgram = "otd"; maintainers = with lib.maintainers; [ gepbird thiagokokada @@ -133,6 +135,5 @@ buildDotnetModule rec { "x86_64-linux" "aarch64-linux" ]; - mainProgram = "otd"; }; } From e849f765d6dd6b929cca313f2af3ba19e7e3965d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 20 Dec 2024 13:12:25 +0100 Subject: [PATCH 5/6] opentabletdriver: move to finalAttrs --- pkgs/by-name/op/opentabletdriver/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix index 05a432facfe2..05dfbe770fe7 100644 --- a/pkgs/by-name/op/opentabletdriver/package.nix +++ b/pkgs/by-name/op/opentabletdriver/package.nix @@ -18,14 +18,14 @@ wrapGAppsHook3, }: -buildDotnetModule rec { +buildDotnetModule (finalAttrs: { pname = "OpenTabletDriver"; version = "0.6.5.0"; src = fetchFromGitHub { owner = "OpenTabletDriver"; repo = "OpenTabletDriver"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-ILnwHfcV/tW59TLDpAeDwJK708IQfMFBOYuqRtED0kw="; }; @@ -61,7 +61,7 @@ buildDotnetModule rec { udev ]; - buildInputs = runtimeDeps; + buildInputs = finalAttrs.runtimeDeps; doCheck = true; testProjectFile = "OpenTabletDriver.Tests/OpenTabletDriver.Tests.csproj"; @@ -122,7 +122,7 @@ buildDotnetModule rec { }; meta = { - changelog = "https://github.com/OpenTabletDriver/OpenTabletDriver/releases/tag/v${version}"; + changelog = "https://github.com/OpenTabletDriver/OpenTabletDriver/releases/tag/v${finalAttrs.version}"; description = "Open source, cross-platform, user-mode tablet driver"; homepage = "https://github.com/OpenTabletDriver/OpenTabletDriver"; license = lib.licenses.lgpl3Plus; @@ -136,4 +136,4 @@ buildDotnetModule rec { "aarch64-linux" ]; }; -} +}) From a1e6b47118309338f5e04917fcf800078adbcfb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 20 Dec 2024 13:21:43 +0100 Subject: [PATCH 6/6] opentabletdriver: add version checking --- pkgs/by-name/op/opentabletdriver/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix index 05dfbe770fe7..fcb0461de307 100644 --- a/pkgs/by-name/op/opentabletdriver/package.nix +++ b/pkgs/by-name/op/opentabletdriver/package.nix @@ -16,6 +16,7 @@ nixosTests, udev, wrapGAppsHook3, + versionCheckHook, }: buildDotnetModule (finalAttrs: { @@ -114,6 +115,12 @@ buildDotnetModule (finalAttrs: { }) ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/otd-daemon"; + passthru = { updateScript = ./update.sh; tests = {