From 1f81c1992d154c103c63e126bfbc5d355f52a1ed Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 9 Mar 2025 09:47:28 -0400 Subject: [PATCH 1/2] protontricks: add changelog --- pkgs/tools/package-management/protontricks/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index 084e873d63f4..16ff4d8bb2bb 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -87,6 +87,7 @@ buildPythonApplication rec { meta = with lib; { description = "Simple wrapper for running Winetricks commands for Proton-enabled games"; homepage = "https://github.com/Matoking/protontricks"; + changelog = "https://github.com/Matoking/protontricks/blob/${src.tag}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ kira-bruneau ]; platforms = [ From d175a375a699f0a5120fa5646d969ee6f84c2e93 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 9 Mar 2025 09:26:29 -0400 Subject: [PATCH 2/2] protontricks: 1.12.0 -> 1.12.1 --- pkgs/tools/package-management/protontricks/default.nix | 10 ++-------- .../package-management/protontricks/steam-run.patch | 8 ++++---- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index 16ff4d8bb2bb..5aa70a2d9527 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -19,13 +19,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "Matoking"; repo = "protontricks"; tag = version; - hash = "sha256-dCb8mcwXoxD4abJjLEwk5tGp65XkvepmOX+Kc9Dl7fQ="; + hash = "sha256-xNy7quksnZ6BnZk5Rz9kwwoC4xitmfnSe5Zj6gZO8S4="; }; patches = [ @@ -43,12 +43,6 @@ buildPythonApplication rec { revert = true; hash = "sha256-1U/LiAliKtk3ygbIBsmoavXN0RSykiiegtml+bO8CnI="; }) - - # Fix test_run_no_args test - (fetchpatch2 { - url = "https://github.com/Matoking/protontricks/commit/ff2381ad379a612e73f0d4604f1c9c3a012b3355.patch"; - hash = "sha256-aiafLbiqS6TBBiQpfTYPVqhQs2OXYg/4yCtbuTv6Ug8="; - }) ]; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/tools/package-management/protontricks/steam-run.patch b/pkgs/tools/package-management/protontricks/steam-run.patch index 3c865746377a..8f8f921ec7a6 100644 --- a/pkgs/tools/package-management/protontricks/steam-run.patch +++ b/pkgs/tools/package-management/protontricks/steam-run.patch @@ -29,7 +29,7 @@ index 8168dae..cb3e7d9 100644 # for the duration of the Protontricks session. # This is accomplished by launching a simple Windows batch script that will diff --git a/src/protontricks/util.py b/src/protontricks/util.py -index 9262cd0..00b2b2f 100644 +index 0c7de98..afea7e4 100644 --- a/src/protontricks/util.py +++ b/src/protontricks/util.py @@ -99,7 +99,7 @@ def get_host_library_paths(): @@ -42,10 +42,10 @@ index 9262cd0..00b2b2f 100644 ) lines = result.stdout.decode("utf-8").split("\n") diff --git a/tests/conftest.py b/tests/conftest.py -index a516437..88bf804 100644 +index fdb44ed..4758799 100644 --- a/tests/conftest.py +++ b/tests/conftest.py -@@ -170,7 +170,7 @@ def steam_runtime_dir(steam_dir): +@@ -175,7 +175,7 @@ def steam_runtime_dir(steam_dir): """ (steam_dir.parent / "root" / "ubuntu12_32" / "steam-runtime").mkdir(parents=True) (steam_dir.parent / "root" / "ubuntu12_32" / "steam-runtime" / "run.sh").write_text( @@ -54,7 +54,7 @@ index a516437..88bf804 100644 """if [ "$1" = "--print-steam-runtime-library-paths" ]; then\n""" " echo 'fake_steam_runtime/lib:fake_steam_runtime/lib64'\n" "fi" -@@ -764,7 +764,7 @@ def xdg_user_dir_bin(home_dir): +@@ -768,7 +768,7 @@ def xdg_user_dir_bin(home_dir): # Only mock PICTURES and DOWNLOAD; mocking everything isn't necessary # for the tests. (home_dir / ".local" / "bin" / "xdg-user-dir").write_text(