From 42b9f35615c2b9bd097ba7fec86ef7b54f5c4d96 Mon Sep 17 00:00:00 2001 From: Harinn Date: Mon, 15 Jun 2026 22:25:38 +0700 Subject: [PATCH 1/2] python3Packages.vpk: migrate to pyproject --- pkgs/development/python-modules/vpk/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/vpk/default.nix b/pkgs/development/python-modules/vpk/default.nix index 0b8fdbecb630..19d760b94f08 100644 --- a/pkgs/development/python-modules/vpk/default.nix +++ b/pkgs/development/python-modules/vpk/default.nix @@ -2,13 +2,14 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "vpk"; version = "1.4.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "ValvePython"; @@ -17,6 +18,8 @@ buildPythonPackage rec { hash = "sha256-SPkPb8kveAR2cN9kd2plS+TjmBYBCfa6pJ0c22l69M0="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { From 2f7d4981bca14614fce68de99b9a376ddabd20e7 Mon Sep 17 00:00:00 2001 From: Harinn Date: Mon, 15 Jun 2026 22:26:48 +0700 Subject: [PATCH 2/2] python3Packages.vpk: modernize --- pkgs/development/python-modules/vpk/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/vpk/default.nix b/pkgs/development/python-modules/vpk/default.nix index 19d760b94f08..c304d8a9bf51 100644 --- a/pkgs/development/python-modules/vpk/default.nix +++ b/pkgs/development/python-modules/vpk/default.nix @@ -6,15 +6,17 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "vpk"; version = "1.4.0"; pyproject = true; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "ValvePython"; repo = "vpk"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SPkPb8kveAR2cN9kd2plS+TjmBYBCfa6pJ0c22l69M0="; }; @@ -22,6 +24,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "vpk" ]; + meta = { description = "Library for working with Valve Pak files"; mainProgram = "vpk"; @@ -29,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ joshuafern ]; }; -} +})