From cfa2ca888d02bfb784362512c235177953c466e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 09:45:16 +0200 Subject: [PATCH 1/3] python312Packages.pytransportnswv2: 0.2.4 -> 0.3.0 --- .../python-modules/pytransportnswv2/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytransportnswv2/default.nix b/pkgs/development/python-modules/pytransportnswv2/default.nix index a2cf2afb7087..b211c271ce20 100644 --- a/pkgs/development/python-modules/pytransportnswv2/default.nix +++ b/pkgs/development/python-modules/pytransportnswv2/default.nix @@ -8,15 +8,14 @@ buildPythonPackage rec { pname = "pytransportnswv2"; - version = "0.2.4"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { - pname = "PyTransportNSWv2"; - inherit version; - sha256 = "129rrqckqgfrwdx0b83dqphcv55cxs5i8jl1ascia7rpzjn109ah"; + inherit pname version; + hash = "sha256-9bpIu+Uc6eFSEGeEfpVwfrhvLekR8qOd571qMnLTpVg="; }; propagatedBuildInputs = [ From cfc8c3afcde9e34ca31dfef9a24a116026f30c81 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 09:51:42 +0200 Subject: [PATCH 2/3] python312Packages.pytransportnswv2: refactor --- .../python-modules/pytransportnswv2/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pytransportnswv2/default.nix b/pkgs/development/python-modules/pytransportnswv2/default.nix index b211c271ce20..6d3e6d8a59ec 100644 --- a/pkgs/development/python-modules/pytransportnswv2/default.nix +++ b/pkgs/development/python-modules/pytransportnswv2/default.nix @@ -1,24 +1,29 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , gtfs-realtime-bindings +, pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "pytransportnswv2"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-9bpIu+Uc6eFSEGeEfpVwfrhvLekR8qOd571qMnLTpVg="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ gtfs-realtime-bindings requests ]; @@ -31,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to access Transport NSW information"; homepage = "https://github.com/andystewart999/TransportNSW"; - license = with licenses; [ gpl3Only ]; + license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; }; } From a00b196f102e91108ee79193715610b70dae9735 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 09:51:59 +0200 Subject: [PATCH 3/3] python312Packages.pytransportnswv2: format with nixfmt --- .../pytransportnswv2/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pytransportnswv2/default.nix b/pkgs/development/python-modules/pytransportnswv2/default.nix index 6d3e6d8a59ec..2f4bc7370976 100644 --- a/pkgs/development/python-modules/pytransportnswv2/default.nix +++ b/pkgs/development/python-modules/pytransportnswv2/default.nix @@ -1,10 +1,11 @@ -{ lib -, buildPythonPackage -, fetchPypi -, gtfs-realtime-bindings -, pythonOlder -, requests -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + gtfs-realtime-bindings, + pythonOlder, + requests, + setuptools, }: buildPythonPackage rec { @@ -19,9 +20,7 @@ buildPythonPackage rec { hash = "sha256-9bpIu+Uc6eFSEGeEfpVwfrhvLekR8qOd571qMnLTpVg="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ gtfs-realtime-bindings