From cdb5859977c13d6f142e40cf4d17e4cce55fbf8d Mon Sep 17 00:00:00 2001 From: Wulpey Date: Thu, 29 May 2025 16:41:44 +0300 Subject: [PATCH 1/4] maintainers: add wulpine --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 82ec8c217134..5e07ee8279cd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -27115,6 +27115,13 @@ githubId = 13378502; name = "Wulfsta"; }; + wulpine = { + name = "Wulpey"; + email = "wulpine@proton.me"; + matrix = "@wulpine:matrix.org"; + github = "wulpine"; + githubId = 59339992; + }; wunderbrick = { name = "Andrew Phipps"; email = "lambdafuzz@tutanota.com"; From bb94f544b050f58565e613a8174f230486149019 Mon Sep 17 00:00:00 2001 From: Wulpey Date: Thu, 29 May 2025 17:39:23 +0300 Subject: [PATCH 2/4] python312Packages.osrparse: init at 7.0.1 --- .../python-modules/osrparse/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/osrparse/default.nix diff --git a/pkgs/development/python-modules/osrparse/default.nix b/pkgs/development/python-modules/osrparse/default.nix new file mode 100644 index 000000000000..2100dc311790 --- /dev/null +++ b/pkgs/development/python-modules/osrparse/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hypothesis, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "osrparse"; + version = "7.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "kszlim"; + repo = "osu-replay-parser"; + tag = "v${version}"; + hash = "sha256-MBE4z1SDkr0YA5ommF+WZyR2N67Y1/xmDhxrTrUhQJk="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ + hypothesis + pytestCheckHook + ]; + + pythonImportsCheck = [ "osrparse" ]; + + meta = { + description = "Parser for osr (osu! replays) file format"; + homepage = "https://github.com/kszlim/osu-replay-parser"; + changelog = "https://github.com/kszlim/osu-replay-parser/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wulpine ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a067aa7bf69a..62cf9e9b47a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10891,6 +10891,8 @@ self: super: with self; { osqp = callPackage ../development/python-modules/osqp { }; + osrparse = callPackage ../development/python-modules/osrparse { }; + oss2 = callPackage ../development/python-modules/oss2 { }; ossfs = callPackage ../development/python-modules/ossfs { }; From 5e1e35996b9056b48aeb583a35accdbf9d9c543e Mon Sep 17 00:00:00 2001 From: Wulpey Date: Thu, 29 May 2025 17:54:53 +0300 Subject: [PATCH 3/4] python312Packages.typing-utils: init at 0.1.0 --- .../python-modules/typing-utils/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/typing-utils/default.nix diff --git a/pkgs/development/python-modules/typing-utils/default.nix b/pkgs/development/python-modules/typing-utils/default.nix new file mode 100644 index 000000000000..fef5f3bdc435 --- /dev/null +++ b/pkgs/development/python-modules/typing-utils/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "typing-utils"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bojiang"; + repo = "typing_utils"; + tag = "v${version}"; + hash = "sha256-eXVGpe1wCH1JG+7ZP0evlxhw189GrrRzTwNDCALn3JI="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "typing_utils" ]; + + meta = { + description = "Utils to inspect Python type annotations"; + homepage = "https://github.com/bojiang/typing_utils"; + changelog = "https://github.com/bojiang/typing_utils/releases/tag/${src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ wulpine ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 62cf9e9b47a5..44d43f43b73e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18637,6 +18637,8 @@ self: super: with self; { typing-inspection = callPackage ../development/python-modules/typing-inspection { }; + typing-utils = callPackage ../development/python-modules/typing-utils { }; + typing-validation = callPackage ../development/python-modules/typing-validation { }; typish = callPackage ../development/python-modules/typish { }; From 5130436b3665386b7951e1b033f8d0f1f73a6445 Mon Sep 17 00:00:00 2001 From: Wulpey Date: Thu, 29 May 2025 18:17:39 +0300 Subject: [PATCH 4/4] python312Packages.ossapi: init at 5.2.1 --- .../python-modules/ossapi/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/ossapi/default.nix diff --git a/pkgs/development/python-modules/ossapi/default.nix b/pkgs/development/python-modules/ossapi/default.nix new file mode 100644 index 000000000000..894ae6dcf01b --- /dev/null +++ b/pkgs/development/python-modules/ossapi/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + aiohttp, + osrparse, + requests, + requests-oauthlib, + setuptools, + typing-utils, +}: + +buildPythonPackage rec { + pname = "ossapi"; + version = "5.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tybug"; + repo = "ossapi"; + tag = "v${version}"; + hash = "sha256-eCq+NbDYoJ5y1ZC4RfVJUTYcT9AOLU1mtgpZkcSYZG8="; + }; + + build-system = [ setuptools ]; + + pythonRelaxDeps = [ "osrparse" ]; + + dependencies = [ + osrparse + requests + requests-oauthlib + typing-utils + ]; + + optional-dependencies = { + async = [ aiohttp ]; + }; + + # Tests require Internet access and an osu! API key + doCheck = false; + + pythonImportsCheck = [ "ossapi" ]; + + meta = { + description = "Python wrapper for the osu! API"; + homepage = "https://github.com/tybug/ossapi"; + changelog = "https://github.com/tybug/ossapi/releases/tag/${src.tag}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ wulpine ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 44d43f43b73e..806b6489a407 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10895,6 +10895,8 @@ self: super: with self; { oss2 = callPackage ../development/python-modules/oss2 { }; + ossapi = callPackage ../development/python-modules/ossapi { }; + ossfs = callPackage ../development/python-modules/ossfs { }; osxphotos = callPackage ../development/python-modules/osxphotos { };