From 993f9defe1246cefae13dccf285979f5adbe8943 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Apr 2023 19:58:28 +0200 Subject: [PATCH 1/2] python310Packages.immutabledict: 2.2.3 -> 2.2.4 https://github.com/corenting/immutabledict/blob/v2.2.4/CHANGELOG.md --- pkgs/development/python-modules/immutabledict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/immutabledict/default.nix b/pkgs/development/python-modules/immutabledict/default.nix index 8fef0641b1f1..249f789513d2 100644 --- a/pkgs/development/python-modules/immutabledict/default.nix +++ b/pkgs/development/python-modules/immutabledict/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "immutabledict"; - version = "2.2.3"; + version = "2.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "corenting"; repo = "immutabledict"; rev = "v${version}"; - hash = "sha256-GeQ1BEBt+66YhohyaXt7rIVNpEk6mINwsC3JrmYNjRI="; + hash = "sha256-cykTZw3p6P35rHaJmfmiXIqybc+ZeqUkxneoPot7E9Q="; }; nativeBuildInputs = [ From 398f1d6b14f19f6e37a5b98f252cfd2566c9b7c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 8 Apr 2023 20:14:11 +0200 Subject: [PATCH 2/2] mozphab: 1.1.0 -> 1.4.3 --- pkgs/applications/misc/mozphab/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/mozphab/default.nix b/pkgs/applications/misc/mozphab/default.nix index 82cf9b3d9515..28f1e4b2d98c 100644 --- a/pkgs/applications/misc/mozphab/default.nix +++ b/pkgs/applications/misc/mozphab/default.nix @@ -10,22 +10,30 @@ python3.pkgs.buildPythonApplication rec { pname = "mozphab"; - version = "1.1.0"; - format = "setuptools"; + version = "1.4.3"; + format = "pyproject"; src = fetchFromGitHub { owner = "mozilla-conduit"; repo = "review"; rev = "refs/tags/${version}"; - hash = "sha256-vLHikGjTYOeXd6jDRsoCkq3i0eh6Ttd4KdvlixjzdZ4="; + hash = "sha256-FUHT4MPzSxO3MCNYWodNxvFR2kL0P4eGmSHPtCt0Cug="; }; postPatch = '' - substituteInPlace setup.py \ + substituteInPlace pyproject.toml \ --replace "glean-sdk>=50.0.1,==50.*" "glean-sdk" ''; + nativeBuildInputs = with python3.pkgs; [ + setuptools + setuptools-scm + ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = with python3.pkgs; [ + colorama distro glean-sdk packaging