From edac51dc0bc1f209ad4740a57bb80c2233a4484d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Nov 2024 16:06:40 +0000 Subject: [PATCH 1/2] python312Packages.nsapi: 3.0.5 -> 3.1.2 --- pkgs/development/python-modules/nsapi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nsapi/default.nix b/pkgs/development/python-modules/nsapi/default.nix index 63bd70151c89..b5270665e24e 100644 --- a/pkgs/development/python-modules/nsapi/default.nix +++ b/pkgs/development/python-modules/nsapi/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "nsapi"; - version = "3.0.5"; + version = "3.1.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aquatix"; repo = "ns-api"; - rev = "v${version}"; - sha256 = "0i1zkvi4mrhkh1gxzpa54mq8mb76s9nf3jxxhpqia56nkq8f8krb"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-H8qxqzcGZ52W/HbTuKdnfnaYdZFaxzuUhrniS1zsL2w="; }; propagatedBuildInputs = [ From 416be31d221d366ca3ede57a358db066aa73338b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 26 Nov 2024 09:32:17 +0100 Subject: [PATCH 2/2] python312Packages.nsapi: refactor --- .../python-modules/nsapi/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/nsapi/default.nix b/pkgs/development/python-modules/nsapi/default.nix index b5270665e24e..4184a743751c 100644 --- a/pkgs/development/python-modules/nsapi/default.nix +++ b/pkgs/development/python-modules/nsapi/default.nix @@ -2,16 +2,17 @@ lib, buildPythonPackage, fetchFromGitHub, - future, pythonOlder, pytz, + setuptools, }: buildPythonPackage rec { pname = "nsapi"; version = "3.1.2"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aquatix"; @@ -20,10 +21,9 @@ buildPythonPackage rec { sha256 = "sha256-H8qxqzcGZ52W/HbTuKdnfnaYdZFaxzuUhrniS1zsL2w="; }; - propagatedBuildInputs = [ - future - pytz - ]; + build-system = [ setuptools ]; + + dependencies = [ pytz ]; # Project has no tests doCheck = false; @@ -33,7 +33,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to query routes of the Dutch railways"; homepage = "https://github.com/aquatix/ns-api/"; - license = with licenses; [ mit ]; + changelog = "https://github.com/aquatix/ns-api/releases/tag/v${version}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; }