From 58f636511e753e04ff07d43dc54bfbeec086e305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Mar 2022 17:23:41 +0200 Subject: [PATCH 1/2] python27Packages.pathlib2: fix build --- pkgs/development/python-modules/pathlib2/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index bbaff2731020..86d3ed871661 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -5,7 +5,8 @@ , pythonOlder , scandir ? null , glibcLocales -, mock ? null +, mock +, typing }: buildPythonPackage rec { @@ -17,8 +18,10 @@ buildPythonPackage rec { sha256 = "sha256-n+DtrYmLg8DD4ZnIQrJ+0hZkXS4Xd1ey3Wc4TUETxkE="; }; - propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir; - checkInputs = [ glibcLocales ] ++ lib.optional (pythonOlder "3.3") mock; + propagatedBuildInputs = [ six ] + ++ lib.optionals (pythonOlder "3.5") [ scandir typing ]; + checkInputs = [ glibcLocales ] + ++ lib.optional (pythonOlder "3.3") mock; preCheck = '' export LC_ALL="en_US.UTF-8" From 6319376cb644a9741fa9e9383b2f30cd0e5e1df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Mar 2022 17:23:51 +0200 Subject: [PATCH 2/2] python39Packages.pathlib2: update homepage, add SuperSandro2000 as maintainer --- pkgs/development/python-modules/pathlib2/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 86d3ed871661..f0f0163652ca 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -27,9 +27,10 @@ buildPythonPackage rec { export LC_ALL="en_US.UTF-8" ''; - meta = { + meta = with lib; { description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems."; - homepage = "https://pypi.python.org/pypi/pathlib2/"; - license = with lib.licenses; [ mit ]; + homepage = "https://pypi.org/project/pathlib2/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; }