From 19fe29df6804efadc7e90f25261a681b086381d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Apr 2023 11:24:43 +0200 Subject: [PATCH 1/2] python310Packages.frigidaire: add changelog to meta --- pkgs/development/python-modules/frigidaire/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index 92ce118638c7..3887df4664d7 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bm1549"; repo = pname; - rev = version; + rev = "regs/tags/${version}"; hash = "sha256-U2ixBtigY15RzMNIeUK71uNOndUepK2kE/CTFwl855w="; }; @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for the Frigidaire devices"; homepage = "https://github.com/bm1549/frigidaire"; + changelog = "https://github.com/bm1549/frigidaire/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From ba1e506c2506632da0ca9b59819920c7ad533bd0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Apr 2023 11:34:57 +0200 Subject: [PATCH 2/2] python310Packages.frigidaire: fix version identifiers --- pkgs/development/python-modules/frigidaire/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index 3887df4664d7..16d871ccd09a 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -23,6 +23,13 @@ buildPythonPackage rec { hash = "sha256-U2ixBtigY15RzMNIeUK71uNOndUepK2kE/CTFwl855w="; }; + postPatch = '' + # https://github.com/bm1549/frigidaire/pull/13 + substituteInPlace setup.py \ + --replace "urllib3>==1.26.42" "urllib3" \ + --replace 'version = "SNAPSHOT"' 'version = "${version}"' + ''; + propagatedBuildInputs = [ certifi chardet