From e82086eaa183cc91b9b47de9cf92e296cecacfbd Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 24 Mar 2025 22:39:26 +0100 Subject: [PATCH 1/6] granian: 1.7.0 -> 2.2.0 --- pkgs/by-name/gr/granian/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/granian/package.nix b/pkgs/by-name/gr/granian/package.nix index 4ed069e3a31c..4b6ba09179f1 100644 --- a/pkgs/by-name/gr/granian/package.nix +++ b/pkgs/by-name/gr/granian/package.nix @@ -4,24 +4,25 @@ rustPlatform, python3Packages, libiconv, + nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "granian"; - version = "1.7.0"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "emmett-framework"; repo = "granian"; rev = "v${version}"; - hash = "sha256-OjyDwfp0d779oFQ7wUdR1eRPP35kcJa3wIdcYGrGGME="; + hash = "sha256-YQ9+PcKXtSc+wdvhgDfSAfcv/y53oqcrPCEI9dDKFa0="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-jAjHvVyFhGGE/OwfusUE/GdrNrEgvh48lmC5tla4lhI="; + hash = "sha256-XJ61+u5aGQis6YkfASD+WJHEKDBL+2ImqCAuQmm3A/g="; }; nativeBuildInputs = with rustPlatform; [ @@ -38,6 +39,8 @@ python3Packages.buildPythonApplication rec { python3Packages.click ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Rust HTTP server for Python ASGI/WSGI/RSGI applications"; homepage = "https://github.com/emmett-framework/granian"; From d6a369fe3b072189aa7103432b60e2959b54e9a9 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 24 Mar 2025 22:56:41 +0100 Subject: [PATCH 2/6] granian: move to python3Packages --- pkgs/by-name/gr/granian/package.nix | 50 +---------------- .../python-modules/granian/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 57 insertions(+), 49 deletions(-) create mode 100644 pkgs/development/python-modules/granian/default.nix diff --git a/pkgs/by-name/gr/granian/package.nix b/pkgs/by-name/gr/granian/package.nix index 4b6ba09179f1..b7ae540a4696 100644 --- a/pkgs/by-name/gr/granian/package.nix +++ b/pkgs/by-name/gr/granian/package.nix @@ -1,52 +1,4 @@ { - lib, - fetchFromGitHub, - rustPlatform, python3Packages, - libiconv, - nix-update-script, }: - -python3Packages.buildPythonApplication rec { - pname = "granian"; - version = "2.2.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "emmett-framework"; - repo = "granian"; - rev = "v${version}"; - hash = "sha256-YQ9+PcKXtSc+wdvhgDfSAfcv/y53oqcrPCEI9dDKFa0="; - }; - - cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-XJ61+u5aGQis6YkfASD+WJHEKDBL+2ImqCAuQmm3A/g="; - }; - - nativeBuildInputs = with rustPlatform; [ - cargoSetupHook - maturinBuildHook - ]; - - buildInputs = [ - libiconv - ]; - - dependencies = [ - python3Packages.uvloop - python3Packages.click - ]; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Rust HTTP server for Python ASGI/WSGI/RSGI applications"; - homepage = "https://github.com/emmett-framework/granian"; - license = lib.licenses.bsd3; - mainProgram = "granian"; - maintainers = with lib.maintainers; [ lucastso10 ]; - platforms = lib.platforms.unix; - }; -} +python3Packages.toPythonApplication python3Packages.granian diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix new file mode 100644 index 000000000000..6435bd19b6e2 --- /dev/null +++ b/pkgs/development/python-modules/granian/default.nix @@ -0,0 +1,54 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + buildPythonPackage, + uvloop, + click, + libiconv, + nix-update-script, +}: + +buildPythonPackage rec { + pname = "granian"; + version = "2.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "emmett-framework"; + repo = "granian"; + rev = "v${version}"; + hash = "sha256-YQ9+PcKXtSc+wdvhgDfSAfcv/y53oqcrPCEI9dDKFa0="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-XJ61+u5aGQis6YkfASD+WJHEKDBL+2ImqCAuQmm3A/g="; + }; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + buildInputs = [ + libiconv + ]; + + dependencies = [ + uvloop + click + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Rust HTTP server for Python ASGI/WSGI/RSGI applications"; + homepage = "https://github.com/emmett-framework/granian"; + license = lib.licenses.bsd3; + mainProgram = "granian"; + maintainers = with lib.maintainers; [ lucastso10 ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 84089eace07f..c7d1850c63ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5860,6 +5860,8 @@ self: super: with self; { grandalf = callPackage ../development/python-modules/grandalf { }; + granian = callPackage ../development/python-modules/granian { }; + graph-tool = callPackage ../development/python-modules/graph-tool { inherit (pkgs) cgal; }; grapheme = callPackage ../development/python-modules/grapheme { }; From df481d6d949987041cf4382aa599bf46dec2dd08 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 27 Mar 2025 16:20:12 +0100 Subject: [PATCH 3/6] python313Packages.granian: enable checks, add pbsds as maintainer --- .../python-modules/granian/default.nix | 57 +++++++++++++++---- 1 file changed, 47 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix index 6435bd19b6e2..5a2953607dde 100644 --- a/pkgs/development/python-modules/granian/default.nix +++ b/pkgs/development/python-modules/granian/default.nix @@ -2,10 +2,18 @@ lib, fetchFromGitHub, rustPlatform, + cacert, buildPythonPackage, uvloop, click, - libiconv, + setproctitle, + watchfiles, + versionCheckHook, + pytestCheckHook, + pytest-asyncio, + websockets, + httpx, + sniffio, nix-update-script, }: @@ -17,13 +25,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "emmett-framework"; repo = "granian"; - rev = "v${version}"; + tag = "v${version}"; hash = "sha256-YQ9+PcKXtSc+wdvhgDfSAfcv/y53oqcrPCEI9dDKFa0="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-XJ61+u5aGQis6YkfASD+WJHEKDBL+2ImqCAuQmm3A/g="; }; @@ -32,15 +39,42 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = [ - libiconv - ]; - dependencies = [ - uvloop click ]; + optional-dependencies = { + pname = [ setproctitle ]; + reload = [ watchfiles ]; + # rloop = [ rloop ]; # not packaged + uvloop = [ uvloop ]; + }; + + nativeCheckInputs = [ + versionCheckHook + pytestCheckHook + pytest-asyncio + websockets + httpx + sniffio + ]; + + preCheck = '' + # collides with the one installed in $out + rm -rf granian/ + ''; + + # needed for checks + env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + __darwinAllowLocalNetworking = true; + + pytestFlagsArray = [ "tests/" ]; + + pythonImportCheck = [ "granian" ]; + + versionCheckProgramArg = "--version"; + passthru.updateScript = nix-update-script { }; meta = { @@ -48,7 +82,10 @@ buildPythonPackage rec { homepage = "https://github.com/emmett-framework/granian"; license = lib.licenses.bsd3; mainProgram = "granian"; - maintainers = with lib.maintainers; [ lucastso10 ]; + maintainers = with lib.maintainers; [ + lucastso10 + pbsds + ]; platforms = lib.platforms.unix; }; } From 7e8dc8809112b505ad1983dae863703e481964d5 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 24 Mar 2025 22:33:03 +0100 Subject: [PATCH 4/6] python313Packages.reflex: 0.7.4a0 -> 0.7.4 Changelog: https://github.com/reflex-dev/reflex/releases/tag/v0.7.4 --- pkgs/development/python-modules/reflex/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index be714a1d1df0..9b5a31324fdd 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -9,6 +9,7 @@ dill, distro, fastapi, + granian, gunicorn, hatchling, httpx, @@ -25,6 +26,7 @@ pydantic, pytest-asyncio, pytest-mock, + python-dotenv, pytestCheckHook, python-engineio, python-multipart, @@ -48,14 +50,14 @@ buildPythonPackage rec { pname = "reflex"; - version = "0.7.4a0"; + version = "0.7.4"; pyproject = true; src = fetchFromGitHub { owner = "reflex-dev"; repo = "reflex"; tag = "v${version}"; - hash = "sha256-KFNcdPoZc+Zps8OV3aLIkk9rlbfy6rx0I9JrYFt2b5E="; + hash = "sha256-Ra7XFa86sZ18xXjfJ4COiIl7MDqz87MPLRws+kGEfKk="; }; pythonRelaxDeps = [ @@ -77,6 +79,8 @@ buildPythonPackage rec { dill distro fastapi + granian + granian.optional-dependencies.reload gunicorn httpx jinja2 @@ -106,6 +110,7 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio pytest-mock + python-dotenv playwright attrs numpy From 9d248114fa1db17f3ff1dac35bcc2d0dfcb33dae Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 24 Mar 2025 22:33:11 +0100 Subject: [PATCH 5/6] python313Packages.reflex-chakra: 0.6.3 -> 0.7.0 Changelog: https://github.com/reflex-dev/reflex-chakra/releases/tag/v0.7.0 --- .../python-modules/reflex-chakra/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/reflex-chakra/default.nix b/pkgs/development/python-modules/reflex-chakra/default.nix index e197395d1d2a..b51b86d660c8 100644 --- a/pkgs/development/python-modules/reflex-chakra/default.nix +++ b/pkgs/development/python-modules/reflex-chakra/default.nix @@ -4,6 +4,8 @@ fetchFromGitHub, poetry-core, pythonOlder, + reflex, + pytestCheckHook, }: buildPythonPackage rec { @@ -20,22 +22,25 @@ buildPythonPackage rec { hash = "sha256-foIXPLWcxNf33y39BgiRpvwRnZOTcfAjhCvC4TD8ZMs="; }; - pythonRemoveDeps = [ - # Circular dependency - "reflex" - ]; - build-system = [ poetry-core ]; - # pythonImportsCheck = [ "reflex_chakra" ]; + dependencies = [ + reflex + ]; + pythonImportsCheck = [ "reflex_chakra" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + # there are no "test_*.py" files, and the + # other files with `test_*` functions are not maintained it seems doCheck = false; - meta = with lib; { + meta = { description = "Chakra Implementation in Reflex"; homepage = "https://github.com/reflex-dev/reflex-chakra"; changelog = "https://github.com/reflex-dev/reflex-chakra/releases/tag/${src.tag}"; - license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; }; } From 8f1d307f91161dab45f8063a86dc4a08a9b433ff Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 1 Apr 2025 01:11:27 +0200 Subject: [PATCH 6/6] python313Packages.reflex: 0.7.4 -> 0.7.5 Diff: https://github.com/reflex-dev/reflex/compare/refs/tags/v0.7.4...v0.7.5 Changelog: https://github.com/reflex-dev/reflex/releases/tag/v0.7.5 --- pkgs/development/python-modules/reflex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index 9b5a31324fdd..07ed325d19ec 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -50,14 +50,14 @@ buildPythonPackage rec { pname = "reflex"; - version = "0.7.4"; + version = "0.7.5"; pyproject = true; src = fetchFromGitHub { owner = "reflex-dev"; repo = "reflex"; tag = "v${version}"; - hash = "sha256-Ra7XFa86sZ18xXjfJ4COiIl7MDqz87MPLRws+kGEfKk="; + hash = "sha256-uHlLItjONHGnuE4t2UOcVRYxcDDbRldUwHd8mPn7JfY="; }; pythonRelaxDeps = [