From 842d86d185b13d7909009c82c88e2dcc7169e326 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 May 2024 08:00:54 +0000 Subject: [PATCH 1/3] python311Packages.peewee: 3.17.3 -> 3.17.5 --- pkgs/development/python-modules/peewee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index a99abb74559d..92aaedbc2159 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.17.3"; + version = "3.17.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-F0bv9J2etrVF8wMU3caQ1ZA6TmQQOPTZWFjGsKOEPwo="; + hash = "sha256-2SrqWPyeDBKOweLu7bEcDIAqCCtnKv0VBdzfpaA22ow="; }; buildInputs = [ From 051f11acf4dab5f7d490e5c3ac889a29992bec19 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 May 2024 09:50:43 +0200 Subject: [PATCH 2/3] python312Packages.peewee: refactor --- pkgs/development/python-modules/peewee/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 92aaedbc2159..423ba8d914e5 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -11,22 +11,27 @@ , withPostgres ? false , psycopg2 , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "peewee"; version = "3.17.5"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "coleifer"; - repo = pname; + repo = "peewee"; rev = "refs/tags/${version}"; hash = "sha256-2SrqWPyeDBKOweLu7bEcDIAqCCtnKv0VBdzfpaA22ow="; }; + build-system = [ + setuptools + ]; + buildInputs = [ sqlite cython @@ -57,9 +62,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python ORM with support for various database implementation"; - mainProgram = "pwiz.py"; homepage = "http://peewee-orm.com"; + changelog = "https://github.com/coleifer/peewee/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "pwiz.py"; }; } From 25a86627a289196b098e8251d487f34ba35e86aa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 May 2024 09:51:18 +0200 Subject: [PATCH 3/3] python312Packages.peewee: format with nixfmt --- .../python-modules/peewee/default.nix | 47 ++++++++----------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 423ba8d914e5..93b27731359c 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -1,17 +1,18 @@ -{ lib -, apsw -, buildPythonPackage -, cython -, fetchFromGitHub -, flask -, python -, sqlite -, withMysql ? false -, mysql-connector -, withPostgres ? false -, psycopg2 -, pythonOlder -, setuptools +{ + lib, + apsw, + buildPythonPackage, + cython, + fetchFromGitHub, + flask, + python, + sqlite, + withMysql ? false, + mysql-connector, + withPostgres ? false, + psycopg2, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -28,9 +29,7 @@ buildPythonPackage rec { hash = "sha256-2SrqWPyeDBKOweLu7bEcDIAqCCtnKv0VBdzfpaA22ow="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; buildInputs = [ sqlite @@ -39,15 +38,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ apsw - ] ++ lib.optionals withPostgres [ - psycopg2 - ] ++ lib.optionals withMysql [ - mysql-connector - ]; + ] ++ lib.optionals withPostgres [ psycopg2 ] ++ lib.optionals withMysql [ mysql-connector ]; - nativeCheckInputs = [ - flask - ]; + nativeCheckInputs = [ flask ]; doCheck = withPostgres; @@ -56,9 +49,7 @@ buildPythonPackage rec { ${python.interpreter} runtests.py ''; - pythonImportsCheck = [ - "peewee" - ]; + pythonImportsCheck = [ "peewee" ]; meta = with lib; { description = "Python ORM with support for various database implementation";