From 33a84830a5a7e6cdeded43a2ee5d48bc5d5f030a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 01:04:39 +0200 Subject: [PATCH 1/2] python312Packages.env-canada: 0.6.1 -> 0.6.2 Diff: https://github.com/michaeldavie/env_canada/compare/refs/tags/v0.6.1...v0.6.2 Changelog: https://github.com/michaeldavie/env_canada/blob/v0.6.2/CHANGELOG.md --- pkgs/development/python-modules/env-canada/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index f11b85d8bf7b..ecb117e8655f 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-6p4holWMAoaosmTL8AveRGuBS/MymC7usvK3I7CBEKQ="; + hash = "sha256-2lrZpjOdijE/udGRzUXT63xI+f9yI+04arfWdt6fMSA="; }; propagatedBuildInputs = [ From eab9b27a24e83bd7434f180b28276657aaa2414d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 01:18:06 +0200 Subject: [PATCH 2/2] python312Packages.env-canada: refactor --- pkgs/development/python-modules/env-canada/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index ecb117e8655f..4b0fab97e95f 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -10,13 +10,14 @@ , pytestCheckHook , python-dateutil , pythonOlder +, setuptools , voluptuous }: buildPythonPackage rec { pname = "env-canada"; version = "0.6.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +28,11 @@ buildPythonPackage rec { hash = "sha256-2lrZpjOdijE/udGRzUXT63xI+f9yI+04arfWdt6fMSA="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp geopy imageio